Bug 1254 - Increase unit test coverage

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