client.search cleanup, couple more tests
minor cleanup
Merge branch 'feature/client-and-logging-cleanup' into develop