Hmm, fix some typos and update tests.