Simplify tests to sync with core

see https://github.com/cfengine/core/pull/1588