Fix video problem and unit test failures