Now dicts are supported. Updated and refactored unit tests.