More Movie tests and fixes in Movie.