APF-1231: fix most of acceptance tests