fixed tests
fixed some more tests
fixed tests