date_ tests implemented, some errors fixed
changing ids
fixed disambiguation