fixed some more tests