Merge "Update L2switch test case"