Fixing some of the tests