Redmine#4826: Simplify acceptance tests without rewriting existing tests more than necessary

see https://cfengine.com/dev/issues/4826