Bulk refactor - increase test coverage and add integration tests, extract some difficult to test methods

Bulk refactor - increase test coverage and add integration tests, extract some difficult to test methods #1111