diff --git a/tests/syntax_test_scope.html b/tests/syntax_test_scope.html
index ee354ec..a7f67e0 100644
--- a/tests/syntax_test_scope.html
+++ b/tests/syntax_test_scope.html
@@ -9,10 +9,10 @@
 #            ^^^^^^^^^^^^^^^^^^^ meta.string.html string.quoted.double.html
 #                               ^ punctuation.definition.tag.end.html
     class extends parentClass
-    # <- source.coffee.embedded.html meta.class.coffee storage.type.class.coffee
-    #^^^^^^^^^^^^^^^^^^^^^^^^ source.coffee.embedded.html meta.class.coffee
-    #^^^^ storage.type.class.coffee
-    #     ^^^^^^^ keyword.control.inheritance.coffee
+    # <- source.coffee.embedded.html meta.class.coffee keyword.declaration.class.coffee
+    #^^^^^^^^^^^^^^^^^^^^^^^^ source.coffee.embedded.html meta.class
+    #^^^^ keyword.declaration.class.coffee
+    #     ^^^^^^^ storage.modifier.extends.coffee
     #             ^^^^^^^^^^^ entity.other.inherited-class.coffee
       constructor: ->
         return
@@ -34,10 +34,10 @@
 #            ^^^^^^^^ meta.string.html string.quoted.double.html
 #                    ^ punctuation.definition.tag.end.html
     class extends parentClass
-    # <- source.coffee.embedded.html meta.class.coffee storage.type.class.coffee
-    #^^^^^^^^^^^^^^^^^^^^^^^^ source.coffee.embedded.html meta.class.coffee
-    #^^^^ storage.type.class.coffee
-    #     ^^^^^^^ keyword.control.inheritance.coffee
+    # <- source.coffee.embedded.html meta.class.coffee keyword.declaration.class.coffee
+    #^^^^^^^^^^^^^^^^^^^^^^^^ source.coffee.embedded.html meta.class
+    #^^^^ keyword.declaration.class.coffee
+    #     ^^^^^^^ storage.modifier.extends.coffee
     #             ^^^^^^^^^^^ entity.other.inherited-class.coffee
       constructor: ->
         return
diff --git a/tests/syntax_test_scope.litcoffee b/tests/syntax_test_scope.litcoffee
index 7c4f1ef..f45843d 100644
--- a/tests/syntax_test_scope.litcoffee
+++ b/tests/syntax_test_scope.litcoffee
@@ -7,8 +7,8 @@
 # Indendet Code Block
 
     class App.Router extends Snakeskin.Router
-    | <- meta.embedded.litcoffee source.coffee.embedded.markdown meta.class.coffee storage.type.class.coffee
-    |^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.embedded.litcoffee source.coffee.embedded.markdown meta.class.coffee
+    | <- meta.embedded.litcoffee source.coffee.embedded.markdown meta.class.coffee keyword.declaration.class.coffee
+    |^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.embedded.litcoffee source.coffee.embedded.markdown meta.class
       index: () =>
         @ensureData((data) =>
           @_parseDates(data, ['trending', 'new', 'top'])
@@ -18,8 +18,8 @@
 - In list items
 
       class App.Router extends Snakeskin.Router
-      | <- markup.list.unnumbered.markdown meta.embedded.litcoffee source.coffee.embedded.markdown meta.class.coffee storage.type.class.coffee
-      |^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ markup.list.unnumbered.markdown meta.embedded.litcoffee source.coffee.embedded.markdown meta.class.coffee
+      | <- markup.list.unnumbered.markdown meta.embedded.litcoffee source.coffee.embedded.markdown meta.class.coffee keyword.declaration.class.coffee
+      |^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ markup.list.unnumbered.markdown meta.embedded.litcoffee source.coffee.embedded.markdown meta.class
         index: () =>
           @ensureData((data) =>
             @_parseDates(data, ['trending', 'new', 'top'])