refactoring 'configurator' + tests