Cluster3 unit tests fixes