merge confligt in sensorBoard and small changes for unit test