Make the tests work