dates: classes, better tests; bug with collections; some renames