Changes made to tests

Signed-off-by: Thierry <thierry.van.loo.tvl@gmail.com>
Fixed merge errors and tests should work now

Signed-off-by: Thierry <thierry.van.loo.tvl@gmail.com>