fixed some of the tests, but not all