Refactoring
Splitting test file into 3