ongoing spec test refactor