further test-fixes