Remove tests checking for optimisation
Merge branch 'master' into search-1.3.x