Add/fix scanner tests.