@wip Revert acceptance tests