enhance acceptance tests, update spec tests
Merge pull request #287 from jlambert121/acceptance

enhance acceptance tests, update spec tests