Pretty much all of these unit test fixes you had to do have been fixed in another commit.  So they can all be reverted unless they were done specifically for this 1.10 compatibility work