No reviewer - Occasional ut failure

Fix up occasional UT failure due to valgrind running things slowly.