Update call-back definition and prevent exception at the root
Make sure the test runs
Fix media URL parsing