Test and lint cleanup.