Refactoring tests. Organizing fixtures.