CONN-602 - Moving tests from Bimodal to Standard
Merge pull request #576 from SrinivasaMurthy/CONN-602B

CONN-602 - Moving tests from Bimodal to Standard