Fix instability in test battery
Merge pull request #1083 from matthewrmshin/fix-unstable-tests

Fix instability in test battery