(#247) fix unit tests
Merge branch 'latency'
Revert "Revert "Merge pull request #247 from connamara/checkLatency""

This reverts commit a17cc1fe13fdd9f33e93e79a3f81b3f660251070.