Some refactoring on the test suite in particular