Cluster3 enhancements and unit tests