Implemented batch tracking events and added further add/update user tests