Implement video streaming and work around test failure