Rework of acceptance tests.