Minor changes to test and Item