Merge "Remove Notion of SKIP in test cases"