fixed test bug noted by chuy2412
Merge branch 'hw3-recipe-tests'
fixed test name test_get_recipe_2 to test_add_recipe_2
updated tests to check for HW 4 stuff
Fixed conflict in tests_by_ctb.py
Fixed tests, except those that wont work until after HW4