Merge pull request #244 from pabuhler/error-check-timing-test

Add simple error checking in timing test to avoid false results.