355 fix video model

Started out to fix Video model.
Ended up fixing a bunch of tests.
Stopping now before it gets too out of hand.