CONN-602 - Moving tests from Bimodal to Standard