Getting ready for some cluster tests