Make the tests work for all