Fixed timing related failures in v1 tests
Merge pull request #25 from ramnivas/v1-test-fix

Fixed timing related failures in v1 tests