Refactoring some more tests.