Fix some of the tests that were failing