Fix item model bugs and add tests up to 67