Fixes tests.  Changes order of tasks to put video test towards the end.