Updated items_controller and added some tests