refactoring complete, ready to begin testing