Added first server tests.  Cleaned up ClusterState.