Tidies unit test a bit.