Add more in-depth parsing of Ingredients
Add tests for new Ingredient parsing logic