Fixed more tests
Fixed more tests