Fix edict2 and tests