Mp4 fix + unit test