CHEF-4851 - Broke testing of cookbooks and versions into own includes.
- This is to fix Travis builds for 1.8.7 which has brought back the dependencies in different orders
- I can replicate Travis behavior on my Mac where sometimes the tests pass and sometimes the pass fail before this fix