-refactorings concerning testability