added search + tests