Continued refactoring tests