Fixed failing scanner tests