Merge "Increase test coverage for services/mapper"