non-deterministic timeouts on slow machines
Merge pull request #1490 from benjchristensen/unit-tests

non-deterministic timeouts on slow machines