Un-xfail working test
Merge remote-tracking branch 'cmr/issue/2773' into HEAD