more scanner tests, fix semicolon bug