Fixed timing related failures in v1 tests