Updating tests to handle cluster config changes