Fix scanner tests
Merge branch 'jake'