fixing some mappings and tests