Fixes #4978: edit the testsuite to be compatible with the CFEngine 3.6 output format