Add remaining mapping and tests