Iteration 2...
started, preparing test coverage for code refactoring