Acceptance tests

Fixes #315.
I have linked to the issue you commented on in a comment here.