naming continuity and test fixes