Identification refactoring + JUNIT