OMG, this should fix the tests.