Slight refactoring of the tests.