Fixed the names
Added method for custom file type
Merge pull request #999 from kcharwood/new_test_cases

New test cases