Fixed some general routing to use nested routing
Fixed more of the tests
Merge branch 'addIngredientAmounts' into development