initiated refactoring / introduced test setup