All services are separated in new tests

Fixes #8