Bug 1254 - Increase UT coverage

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