Video Test Refactoring

Done