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

This and the previous line can all fit on one line.