Fixed tests following variable rename.