Improved media type and related tests.