add test for sensor merging, changed mode to enum
fixed sensor marker