remove private method getCluster and use inline
initial work on create tests