implemented search strategies A1 and B1, modified tests for new results.
Merge remote-tracking branch 'origin/master'