Fix search + add, Fix tests