refactored some tags out to scanners
refactored some tags out to scanners
Increased test coverage