[#930] Clean up: remove unused variables
[#930] Fix search tests after change to default AND operator