tweaks to get tests to pass across all cluster versions