Feature/dict testing

tests for the dicts module and and implements some features/fixes while we're at it.