Bug 584: Increase test coverage

Change-Id: Iabd86a3e7f72d99e227d76ff563a60d031ef0a86
Signed-off-by: Ladislav Borak <lborak@cisco.com>
Merge "Bug 584: Increase test coverage"