VP-211: Move video sources into model using merge policy; fix test.