Use data-driven test and add more test cases