Include shop shipping module in dev requirements. This is so it can be included in travis unit tests.
Rearranged test fixtures and tests in accordance with shop changes.
Updated CategoriesDiscountConstraintTests to also test orders that contain variations