More unit tests for ScannerImpl
am: c658fa0ae1

Change-Id: I445180bbfe03a5328e021c5261107b4611453150