Improved test coverage

Change-Id: I0846432b14d880b17ccf1dad5759b3a1c1dcf2af
Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>