Better naming convention for test cases
Minor changes to make Media testable
Add a bunch of missing tests