Fixed up tests after refactor