updated mappings + tests working in sensor-cloud