XD-1774 Test fix