Bug 1254 - increase UT coverage

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