Add more cluster testing