Issue #6921 Test setup fixed