Fixing some scanning tests