Fix ClusterCommandTest AfterClass handling as it may leave the cluster inconsistent