Fixed a parser bug. Updating tests and functionality for more international cases.