restructure original class to make it testable, hit 100% coverage* (with cc ignores)