Merged tests completed so far
bug fixed
Merge branch 'cebo_unittests' into develop