Merge pull request #12 from dieterdemeyer/master

Fix spec tests
Merge pull request #13 from dieterdemeyer/master

Revert change
Initialize puppet environment due to upgrade puppet version