fixed dic and tests