Fixed failing tests.  Started keyword search modes.