Add fixes and acceptance tests.