Continues adding tests and fixes some typos.