Get more scan tests to pass.