Fixed all test except Event and EventWeek
Updated more tests