Updated testing stuff - added shopping list support