Refactoring acceptance tests 

Using how it's been done on official Puppetlabs repos :+1: