CONN-636: Commented out few tests and changed the sequence of execution ...

...of tests in Bimodal