Split logic out into testable objects

Rubocop clean. Good test coverage of helper objects.