Increase unit test coverage

Change-Id: Id7ff7ce932cb9fc9ea4c4146f1b1b796aae0e4af
Signed-off-by: Robert Varga <rovarga@cisco.com>