BUG-730 : more unit tests to Util.

Change-Id: Iee0db68ef7883bd7db391241d09ac6e9615cd2fb
Signed-off-by: Dana Kutenicsova <dkutenic@cisco.com>