Merge "ART: Refactor TI tests"