Add acceptance test file to resources folder
Minor text edits
"Merge branch 'master' into gh-pages"