search/sort, unit tests

Fixed search/sort to incorporate changes made to recipe ingredient, and
category classes, also fixed unit tests to reflect those changes as well