Updated "mapping" endpoint.
Updated tests.
Cleanup.