Make all the tests work