Adding services and tests