More unit test fixes (this time when running the stress tests)