Hopefully _this_ will fix the last of the unit test failures