Make test order-independent
Merge pull request #57 from mdsol/feature/fault_tolerance_test_fixup

Make test order-independent