Clean a test
Fix function name
Merge branch 'master' into tests
Add test for Scan