Some typos
More tests
Rename some tests