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

I think I need to use type(error).__name__    as used above, will test and update accordingly.