Clean up acceptance tests.
Refactor the acceptance tests a bit.
Add some performance tests.