Fix variable rename
Add tests for maps/dicts