Consolidate tests and suites and add a few more
Make Vagrant and test-kitchen play nicely with ChefDK