Refactor my tests for items_controller.
Merge branch 'develop'