Expanded the tests for ClusterTypes