test's fixes
Merge branch 'OneStringSearch' of bitbucket.org:kladrapi/kladrapi into OneStringSearch

Conflicts:
	tests/OneStringTest.php
test's fix. again...