Merge "Add some test cases for VF-C catalog to CSIT"