Using class-extend
Refactoring tests