Code

Fix minor test issues