CLDCONNECT-2160 : Fixed Metadata Switch & Test Connectivity