Fixing a typo.
Fixing test cases with the recent changes.