Fixing broken unit tests from hash join pull
Increase wait time for MemoryManagerTest to prevent flapping