test/prep refactoring