Refactoring tests in progress.