Update to phone format

Also fixed J-Unit tests to represent new required format