change test class names and refactor stratergy pattern