Fixed #11. Model value is now correct E164 format. Added more unit tests to ensure correct model value.