Simplified cluster setup
Test-fix