attempting restructure for aggregated unit test coverage