Automation fixes for auto search org and location, fix for computeresource tests.

Good. I'm glad you're not interpolating these variables directly.