Minor cleanup of mini-cluster code/tests