Improvements for test cluster