SPLEVO-391 added more unit tests