Removed unimplemented clusters from the Cluster enum
Fixed indenting and reduced complexity of the ClusterFactory, added unittests