Merge "Add test mapping for Traceur"