Initial agency tests, and clean up instanceSave method.
Fixing search to not use agency name.