Adding more tests and fixes to verify robustness of the Oracle failover