Revert "stack/ndtest,software/erp5testnode/testsuite: partially revert f5ebda78"

This reverts commit 90f29b1a and
subsequent fixups.

This partial revert was made in a rush without clear understanding
of the problem. Reverting the partial revert to apply proper fixes.