Fixing some racy conditions in Data Manager tests.

It should no longer be possible for data manager tests to get stuck (ie,
very unlikely).