Start moving cluster tests to use global test vars