Fixed some more tests
Fixed some more tests