XYZ update

Change-Id: I4787a25d1df596fc4d0eece902a27adf2c860d16
Added Test 2

Change-Id: I9dcab652ec95d49d08b4777fb545236ca8bc16bb