Really fix the tests this time