Merge "ART: Remove test files after test"