Update domain model, use cluster name for test