testbench bugfix: re-enable missing tests
Merge branch 'v7-stable' into v7-devel