add search + tests