2.8 test-suite fixes

The other option is to skip the entire test for 2.8 then.....