Fix tests related to service id for Heroku services