XD-479 Polishing (PR Comments)

Also, MediaTypeTests didn't actually test anything.