Deleted price, added dishType to MenuItem, fixed some tests