Merge pull request #885 from dusk-network/mocello/soundness-test-regroup