Actually fixed the tests this time