Type parsing with one test updated.

Ok, I think that looks the same as what was on Phabricator