Fix unit tests

Change-Id: I24091b8b976b30e8d6ef26f41530027339106243
Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>