midway through test refactor