Test: Refactoring of tests