Refactored video tests to be more correct.

See individual commits' comments for more details.