Removed some old test helpers
Added new feature: map to use for linked mappers