Updated tests
Small refactors to video playback