Make the tests work as intended