More FilteredVideoTesting.
Merge branch 'master' into jonas
Adds some Tests, fixes some mistakes these tests find.