More thorough testing of scanner.