Fixed small test issues