* Allow puppet 2.7 to fail tests
* Cleanup a bit