Fix Call and tests, add support for maps

Fixes #1