Fix scanner bug and add scanner test