Bit of refactoring of tests.