Merge "Update test to verify more cases"