Cluster test

Fix #1621