Tested more cases