Fix test typos, add imports.