Tests refactored
Merge branch 'develop' of github.com:ripaclub/sphinxsearch into develop