Clean up mapping handling
Fix test to use (provided ...) syntax
Rename with-mocks to provided