This will hopefully fix a couple recent unit test failures (probably really slow hardware)