WIP fixing tests after refactor