Merge "Remove redundant optf CSIT tests"