Fix existing atests broken by variable recommendation changes