Add type mappings and tests