Replace underscores with dashes in route names
Make sure we actually have app instances before exiting the loop
Remove hardcoded URL and improve independence of serviceBroker tests