Test refactored
Merge branch 'issue-714' of github.com:ppp0/puppet-packages into issue-714