fixed some more tests, should be all green now