Really actually fixed the tests this time