Acceptance testing infrastructure

...and a couple of tests.