Some typo and extended tests.