added tests, and multi keyword search