       expect(tokens[6]).toEqual value: "bar", scopes: ["source.powershell", "string.quoted.single.powershell"]
       expect(tokens[7]).toEqual value: "'", scopes: ["source.powershell", "string.quoted.single.powershell"]
       expect(tokens[8]).toEqual value: " ", scopes: ["source.powershell"]
-      expect(tokens[9]).toEqual value: "#", scopes: ["source.powershell", "comment.line.number-sign.powershell"]
-      expect(tokens[10]).toEqual value: " a trailing comment", scopes: ["source.powershell", "comment.line.number-sign.powershell"]
+      expect(tokens[9]).toEqual value: "#", scopes: ["source.powershell", "comment.line.powershell", "punctuation.definition.comment.powershell"]
+      expect(tokens[10]).toEqual value: " a trailing comment", scopes: ["source.powershell", "comment.line.powershell"]
 
     it "parses comments at the beginning of lines", ->
       {tokens} = grammar.tokenizeLine("# a leading comment")
-      expect(tokens[0]).toEqual value: "#", scopes: ["source.powershell", "comment.line.number-sign.powershell"]
-      expect(tokens[1]).toEqual value: " a leading comment", scopes: ["source.powershell", "comment.line.number-sign.powershell"]
+      expect(tokens[0]).toEqual value: "#", scopes: ["source.powershell", "comment.line.powershell", "punctuation.definition.comment.powershell"]
+      expect(tokens[1]).toEqual value: " a leading comment", scopes: ["source.powershell", "comment.line.powershell"]
 
   describe "start of variable", ->
     it "parses the dollar sign at the beginning of a variable separately", ->

        it "should highlight 'do'", ->
          expect(tokens[0]).toEqual value: "do", scopes: ["source.powershell","keyword.control.powershell"]
        it "should highlight 'until'", ->
          expect(tokens[13]).toEqual value: "until", scopes: ["source.powershell","keyword.control.powershell"]

      describe "'For' statements", ->
        tokens = null

          expect(tokens[0]).toEqual value: "if", scopes: ["source.powershell","keyword.control.powershell"]

        it "should highlight 'elseif'", ->
          expect(tokens[18]).toEqual value: "elseif", scopes: ["source.powershell", "keyword.control.powershell"]

        it "should highlight 'else'", ->
          expect(tokens[37].value).toEqual "else"
          expect(tokens[37]).toHaveScopes ["source.powershell","keyword.control.powershell"]

      describe "Do-until statements", ->
        tokens = null
