Removed invalid diamond error, added diamonditem testing,