working on feedback
Merge branch 'cebo_unittests' into develop