Merge "ART: Fix test dependencies"