Fix regexp for checking expected type
Simplify when the type which removed "x-" is registered
Merge canonical_content_type() to regulate_type()
Improve tests