Refactoring Apache Tests