v2.0.x: Connect test refactor