Moved the scanner to the new Parser InputStream and updated the unit tests to use StringInputStream