wip - test refactor