Added comestible handling, and water as the default testing item.