Fix scanner tests