Address hung tests in Linux.

Follow-up patch coming to address test failures exposed by this change.