Update the unit test to cover complete scenarioChange-Id: Ie2e2a0dc5302ca7a49a0a06eba52be1473b9a461Signed-off-by: Andrew Berezovskyi <andriib@kth.se>