Clean up some mapper specs
Remove unnecessary context wrapping
Add unit specs for mappers talking to data sources
Remove obsolete method