Added acceptance tests
Merge branch 'acceptance-test' for issue #45