Fix broken tests from refactor
13 files changed