update extend/merge methods and tests