[SD-1010] Behave and unit tests added