Improve XFA tests: test order dependence

The test that clears the wali key space was messing with things because this test was using keys from before and after that watershed
Disable three tests that clear the keyspace

These kill other tests if they run in the wrong order