Splitting test class and refactoring tests