Allow for third argument in file dict value to support explicit
file content type.
Fixing test to ensure it passes with python 3.
Merge pull request #1091 from vinodc/specify_file_content_type

Allow for explicit file content type support