fix some of the tests