- fixed some more tests