Redesign the data mappers.
Updated test settings for support the redesigned data mappers.
Added a entity collection and removed the old collections.