Refactoring the test suites