Convert existing test cases - Add Vendor Unit Test