Done a bit more in the test.