Merge "Minor updates to CSIT tests"