Added 2 tests and support for multi-services