Updated ConnectionTest to separate into different steps