Bug 1254 - increase UT coverage

Change-Id: I520491294faa25d46ab86b8d8ae306f5f419dcdb
Signed-off-by: Martin Bobak <mbobak@cisco.com>