Added some things to ScannerTest