Refactoring of the test suite