Refactoring Test Suites - step 4...