more readable
split scanner test to new file
refactoring
add test