Added ITEM support and allow tests to pass. Fix by Ed J for bug #722430.