rewrite tests to reflect refactor