continued refactor to support smash and vows testing