Merge and add test