Fix unit tests (entirely)
Merge branch 'master' into search-1.3.x