Fix some tests and typos.