Accept more mpeg-file file suffixes, including unit test