2.8 test-suite fixes