Minor fix up and added couple more test.
Fix typos.