Expand tokens and fileset. Add sanity tests
Update scanner and refine tests
Merge import changes