More test cluster fixes