New/experimental media merged from Annex60

This is for getting al unit tests to run with the new media (that are not merged by default).