Bug 1254 - increase unit test coverage

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