Merge "Updating Test Suite Names"