added orderBy, fixed clazzDay and fixed a few tests