Added rest service tests

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

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