Fixes #4984: Rewrite tests to uses classes conditions for execresults an.d returnszero, for CFEngine 3.6 compatibility

Er, ignore that, I only just noticed the call to canonify :)