Refactoring Test Suites - step 5...