fixed wrappers for Media Content
Added tests for testing the wrapper
Merge remote-tracking branch 'origin/master'