Test cleanup, preparing for refactoring.