Fix some test issues