Merge "ART: Add more comprehensive merge test"