Merge test branches