- fix the UserData tests broken by previous update adding merge code