refactoring to make it testable
changed test config
linting new files