Added additional tests, fixed various typos