Some tests added, and some typos fixed