Added search generator and more tests.