Video Test Refactoring

thanks. The PR looks fine to me.