Issues/uat 136 map log intensities

Don't merge yet. 
I wish for some feedback especially on the test.