Update cluster tests to use global constants