Index: tests/interceptor-slot.test
===================================================================
diff -u -r3e18b80be2883ba647c2110a2e8e2b1980940c30 -r7d3bc964348a674a9d80ab8751f1f827dbd6b7b9
--- tests/interceptor-slot.test	(.../interceptor-slot.test)	(revision 3e18b80be2883ba647c2110a2e8e2b1980940c30)
+++ tests/interceptor-slot.test	(.../interceptor-slot.test)	(revision 7d3bc964348a674a9d80ab8751f1f827dbd6b7b9)
@@ -294,37 +294,6 @@
   ? {c1 [Z info method origin bar]} "Z Y "
   ? {c1 [Y info method origin bar]} "Y "
 
-  # 
-  # check, whether the context of "[self] -local" is correct
-  #
-  A public method bar {} {[self] -local foo}
-  B public method bar {} {[self] -local foo}
-  C public method bar {} {[self] -local foo}
-  Y public method bar {} {[self] -local foo}
-  Z public method bar {} {[self] -local foo}
-
-  ? {c1 bar} "C B A Z Y "
-  ? {c1 [C info method origin bar]} "C B A Z Y "
-  ? {c1 [B info method origin bar]} "B A Z Y "
-  ? {c1 [A info method origin bar]} "A Z Y "
-  ? {c1 [Z info method origin bar]} "Z Y "
-  ? {c1 [Y info method origin bar]} "Y "
-
-  # 
-  # check, whether the context of "nsf::object::dispatch [self] -local" is correct
-  #
-  A public method bar {} {nsf::object::dispatch [self] -local foo}
-  B public method bar {} {nsf::object::dispatch [self] -local foo}
-  C public method bar {} {nsf::object::dispatch [self] -local foo}
-  Y public method bar {} {nsf::object::dispatch [self] -local foo}
-  Z public method bar {} {nsf::object::dispatch [self] -local foo}
-
-  ? {c1 bar} "C B A Z Y "
-  ? {c1 [C info method origin bar]} "C B A Z Y "
-  ? {c1 [B info method origin bar]} "B A Z Y "
-  ? {c1 [A info method origin bar]} "A Z Y "
-  ? {c1 [Z info method origin bar]} "Z Y "
-  ? {c1 [Y info method origin bar]} "Y "
 }
 
 
@@ -346,7 +315,7 @@
   }
   X create c1
   ? {c1 foo} "C B A X "
-  ? {c1 -intrinsic foo} "X "
+  ? {nsf::object::dispatch c1 -intrinsic foo} "X "
 
   
   #
@@ -358,7 +327,7 @@
 
   Z create c1 -mixin {C B A}
   ? {c1 foo} "C B A Z Y "
-  ? {c1 -intrinsic foo} "Z Y "
+  ? {nsf::object::dispatch c1 -intrinsic foo} "Z Y "
 
   # 
   # check, whether the context of "my -intrinsic" is correct
@@ -378,22 +347,6 @@
   ? {c1 [Y info method origin bar]} "Z Y "
 
   # 
-  # check, whether the context of "[self] -intrinsic" is correct
-  #
-  A public method bar {} {[self] -intrinsic foo}
-  B public method bar {} {[self] -intrinsic foo}
-  C public method bar {} {[self] -intrinsic foo}
-  Y public method bar {} {[self] -intrinsic foo}
-  Z public method bar {} {[self] -intrinsic foo}
-
-  ? {c1 bar} "Z Y "
-  ? {c1 [C info method origin bar]} "Z Y "
-  ? {c1 [B info method origin bar]} "Z Y "
-  ? {c1 [A info method origin bar]} "Z Y "
-  ? {c1 [Z info method origin bar]} "Z Y "
-  ? {c1 [Y info method origin bar]} "Z Y "
-
-  # 
   # check, whether the context of "nsf::object::dispatch [self] -intrinsic" is correct
   #
   A public method bar {} {nsf::object::dispatch [self] -intrinsic foo}