Remove the optimisation at the end of a reindexation
Remove tests checking for optimisation
Fix unit tests (entirely)
Remove unused import
Merge branch 'master' into search-1.5.x