Merge "ART: Refactor run-test 104"