fixed few more broken tests.