Video Test Improvements

OK