Remove check_item model & fix tests