Added tests for multi-cluster support