Updated provider and facility validation and added enrichment logic, with unit tests.
minor code clean-up