Adds service-level tests