Video Test Improvements

Unfortunately this test is still flaky even after these changes. :(