updated test case design to reduce number of test cases and target case scenarios more systematically