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

Good.