Adding handling for dates, country codes.  Continued to refine organization tests.