Updated test with xyz coords
Bug fixes