Splitting TableDomainMapper in two to provide hooks for ConceptProvider.
Fixing a few tests...
Fixing a few tests (reprise)