Fix tests after fix for [CA-135078]