VP-297: Fix to timing of tests that failed in Chrome and Safari