CORE-1760 Improved test infrastructure

Misc connection supplier code cleanup
CORE-1760 Improved test infrastructure

Misc connection supplier code cleanup