Refactoring of tests.