Refactoring test suits - step 2...