Merge test suite fixes from 3.6