Fixed Tests. Need to add test for Video module