Refactor Category spec