And... done fixing the tests