Refactoring Test Suits - step 1...