Added category model tests, and enforce minimum pickup times