Merge "ART: Fix run-test"