Update different things
Use id and date in cursor
Update tests