Refactoring Test Suites - step 3...