A lot happened here.

Added additional tests for movie files. Ensured follow-through of each test etc.
Changed formatting and generally tidied up.