Clean-up, added video playback test