Merge pull request #38 from nickpassarella/master

Fixed tests after nesting resources. One error in the ordered items controller.
Merge pull request #39 from nickpassarella/master

refixed avail menu items test
all tests passing