Added new testing files and updated the cartesian to zmatrix conversion to use arctan2