+ Minor makeup
+ Fix test (dictionary)