refactoring testing places and names