fixed some of the tests