fixed some more tests, finally making some progress