XD-1425 Fix XD Services Unit tests