Refactored and combined tests

Refactored and combined tests. Threw away test_recipe_ingredients. Threw
away carry-over failing test