Fix some small test issues