Patching up some of the unit tests