Ooops. Moving test-code back to the tests.