Sonardotnt 382

Only changes related to SONARDOTNT-382.
Added unite tests