Update unit tests to reflect refactor