fix deep merge tests