Add add & or search criteria unit tests