Continue to work on the refactoring of the test suite