More acceptance tests

Acceptance tests should be almost done, minus the option of adding more cleanup.