Added more cases for the Scanner.java
It's a bit more sloppy than I'd like but it works.