Refactor CategoryPresenter and test