Fully support the more awesome type mapping and adapt the tests to the new structure