Revise input test cases to reduce redundancy and avoid using skip files