Adds basic tests for Filtered Video, cleans some stuff up.