Staged - fixing fragile tests broken by latest refactoring