Refactorings, related to testing too