Add more acceptance tests.