update for more test cases