tests work... commented out a few
fixed merge error in user_item_spec