Fixing Nightly build issue, with Test running to "fast"