Added a couple of 'or', 'and' operations for categories
Updated the helper
Added a couple more tests