Un-borking the tests.