Added parsing support, fixes in the types tests.