Added search and update, along with some tests