added testing and defaultMerge