Replacing test xml descriptors with ShrinkWrap descriptors builders