Refactoring the tests for the scanner.  This is a much better solutions for #6.