Typos
Improved test cases