Refactor
Updating scanner tests.