Fix tests again

So this should actually fix the tests.