Updated tests
Merge branch 'master' of github.com:chrisf74/marionette-resources

Merging.