Bug 1043293 - Follow up with test changes to address failures