Add remaining tests and fix typoes.