Added test cases for x,y,z extractors
Conflicts resolved