Merges changes from @williammartin including acceptance tests and word changes. Co-authored-by: William Martin <williammartin@github.com>
Heath Stewart