ISPN-3061 Total Order Tweaks
ISPN-3085 ExpiryTest intermittent failure
ISPN-2933 MixedModeTest.testMixedMode fails intermittently