Refactor tests to separate most tests from fixture.