Refactoring tests suits