Corrected test cases for 2.2-branch that relied on code in master.