Merge with test