Category Module added, search filter, fixed some tests