Refine structure of acceptance tests