Fixed broken test cases.
Removed uneccessary class ContentTypeConverter.
Removed dependencies that wasn't being used.
Merge branch 'test_cases' into develop