Fix typos
Improve test names
Add tests