Fix non-deterministic test
Merge pull request #1520 from benjchristensen/issue-1429

Fix non-deterministic test