Change test to match the results landed in r29424. The test changes were