Patch some of the unit tests