DS-1490: wip'd search tests for time being.
Merge branch 'master' of https://github.com/inbloom/secure-data-service