diff --git a/repository/Seaside-Tests-Slime.package/WASlimeTest.class/instance/testCallSuperImplementation.st b/repository/Seaside-Tests-Slime.package/WASlimeTest.class/instance/testCallSuperImplementation.st
index 71a00f370..3289bffd2 100644
--- a/repository/Seaside-Tests-Slime.package/WASlimeTest.class/instance/testCallSuperImplementation.st
+++ b/repository/Seaside-Tests-Slime.package/WASlimeTest.class/instance/testCallSuperImplementation.st
@@ -1,10 +1,8 @@
 tests-block
 testCallSuperImplementation
-	| object painter |
-	object := self
-		defineClass: #WASlimeMockObject
-		superclass: #WAObject.
-	self compile: 'postCopy self postCopy' in: object. 
+	| class painter |
+	class := self defineSubClassOf: #WAObject.
+	self compile: 'postCopy self postCopy' in: class. 
 	painter := self
 		defineClass: #WASlimeMockComponent
 		superclass: #WAPainter.
diff --git a/repository/Seaside-Tests-Slime.package/WASlimeTest.class/instance/testChangesStateWhileRendering.st b/repository/Seaside-Tests-Slime.package/WASlimeTest.class/instance/testChangesStateWhileRendering.st
index 24afbe53e..2dc3e5901 100644
--- a/repository/Seaside-Tests-Slime.package/WASlimeTest.class/instance/testChangesStateWhileRendering.st
+++ b/repository/Seaside-Tests-Slime.package/WASlimeTest.class/instance/testChangesStateWhileRendering.st
@@ -1,10 +1,8 @@
 tests-block
 testChangesStateWhileRendering
 	| class |
-	class := self 
-		defineClass: #WASlimeMockComponent
-		superclass: #WAComponent.
-	class addInstanceVariable: 'foo'.
+	class := self defineSubClassOf: #WAComponent.
+	class addInstVarNamed: 'foo'.
 	self compile: 'renderContentOn: html html div: [ foo := nil ]' in: class.
 	self 
 		runRule: WAChangesStateWhileRenderingRule
diff --git a/repository/Seaside-Tests-Slime.package/WASlimeTest.class/instance/testExtractCallbackCodeToMethod.st b/repository/Seaside-Tests-Slime.package/WASlimeTest.class/instance/testExtractCallbackCodeToMethod.st
index 7208121f4..beed9cfd7 100644
--- a/repository/Seaside-Tests-Slime.package/WASlimeTest.class/instance/testExtractCallbackCodeToMethod.st
+++ b/repository/Seaside-Tests-Slime.package/WASlimeTest.class/instance/testExtractCallbackCodeToMethod.st
@@ -1,21 +1,19 @@
 tests-parsetree
 testExtractCallbackCodeToMethod
 	| class |
-	class := self 
-		defineClass: #WASlimeMockComponent
-		superclass: #WAComponent.
-	class
+	class := self defineSubClassOf: #WAComponent.
+	self
 		compile: 'renderInvalidOn: html
 			html anchor 
 				callback: [ self foo. self bar ];
 				with: 1'
-		classified: #(rendering).
-	class
+		in: class.
+	self
 		compile: 'renderValidOn: html
 			html anchor 
 				callback: [ self foo ];
 				with: 1'
-		classified: #(rendering).
+		in: class.
 	self 
 		runRule: WAExtractCallbackCodeToMethodRule
 		selectors: #(renderInvalidOn:)
\ No newline at end of file
diff --git a/repository/Seaside-Tests-Slime.package/WASlimeTest.class/instance/testSendsRenderContentOn.st b/repository/Seaside-Tests-Slime.package/WASlimeTest.class/instance/testSendsRenderContentOn.st
index 9d2f42152..bb539024c 100644
--- a/repository/Seaside-Tests-Slime.package/WASlimeTest.class/instance/testSendsRenderContentOn.st
+++ b/repository/Seaside-Tests-Slime.package/WASlimeTest.class/instance/testSendsRenderContentOn.st
@@ -1,12 +1,10 @@
 tests-parsetree
 testSendsRenderContentOn
 	| class |
-	class := self 
-		defineClass: #WASlimeMockComponent
-		superclass: #WAComponent.
-	class
+	class := self defineSubClassOf: #WAComponent.
+	self
 		compile: 'invalid self renderContentOn: nil'
-		classified: #(rendering).
+		in: class.
 	self 
 		runRule: WASendsRenderContentOnRule
 		selectors: #(invalid)
\ No newline at end of file
diff --git a/repository/Seaside-Tests-Slime.package/WASlimeTest.class/instance/testSequencedAsynchronousCalls.st b/repository/Seaside-Tests-Slime.package/WASlimeTest.class/instance/testSequencedAsynchronousCalls.st
index 8f79790e5..e8787121f 100644
--- a/repository/Seaside-Tests-Slime.package/WASlimeTest.class/instance/testSequencedAsynchronousCalls.st
+++ b/repository/Seaside-Tests-Slime.package/WASlimeTest.class/instance/testSequencedAsynchronousCalls.st
@@ -1,21 +1,19 @@
 tests-parsetree
 testSequencedAsynchronousCalls
 	| class |
-	class := self 
-		defineClass: #WASlimeMockComponent
-		superclass: #WAComponent.
-	class
+	class := self defineSubClassOf: #WAComponent.
+	self
 		compile: 'renderContent1On: html
 			html div
 				onClick: (html jQuery ajax callback: [  ]) , (html jQuery ajax serializeForm);
 				with: ''Click me'''
-		classified: #(rendering).
-	class
+		in: class.
+	self
 		compile: 'renderContent2On: html
 			html div
 				onClick: (html jQuery ajax serializeForm; callback: [  ]) , (html jQuery effect bounce);
 				with: ''Click me'''
-		classified: #(rendering).
+		in: class.
 	self 
 		runRule: WASequencedAsynchronousCallsRule
 		selectors: #(renderContent1On: renderContent2On:)
\ No newline at end of file
diff --git a/repository/Seaside-Tests-Slime.package/WASlimeTest.class/instance/testUnnecessaryBlockPassedToBrush.st b/repository/Seaside-Tests-Slime.package/WASlimeTest.class/instance/testUnnecessaryBlockPassedToBrush.st
index 291c23773..fbdb8ad19 100644
--- a/repository/Seaside-Tests-Slime.package/WASlimeTest.class/instance/testUnnecessaryBlockPassedToBrush.st
+++ b/repository/Seaside-Tests-Slime.package/WASlimeTest.class/instance/testUnnecessaryBlockPassedToBrush.st
@@ -1,27 +1,25 @@
 tests-parsetree
 testUnnecessaryBlockPassedToBrush
 	| class |
-	class := self 
-		defineClass: #WASlimeMockComponent
-		superclass: #WAComponent.
-	class
+	class := self defineSubClassOf: #WAComponent.
+	self
 		compile: 'renderContent01On: html html div: [ ]'
-		classified: #(rendering).
-	class
+		in: class.
+	self
 		compile: 'renderContent02On: html html div: [ html text: 2 ]'
-		classified: #(rendering).
-	class
+		in: class.
+	self
 		compile: 'renderContent03On: html html div: [ html render: 3 ]'
-		classified: #(rendering).
-	class
+		in: class.
+	self
 		compile: 'renderContent04On: html html div class: #foo; with: [ ]'
-		classified: #(rendering).
-	class
+		in: class.
+	self
 		compile: 'renderContent05On: html html div class: #foo; with: [ html text: 5 ]'
-		classified: #(rendering).
-	class
+		in: class.
+	self
 		compile: 'renderContent06On: html html div class: #foo; with: [ html render: 6 ]'
-		classified: #(rendering).
+		in: class.
 	self
 		runRule: WAUnnecessaryBlockPassedToBrushRule
 		selectors: #(renderContent01On: renderContent02On: renderContent03On: renderContent04On: renderContent05On: renderContent06On:)
\ No newline at end of file
diff --git a/repository/Seaside-Tests-Slime.package/WASlimeTest.class/instance/testUnnecessaryWithSentToBrush.st b/repository/Seaside-Tests-Slime.package/WASlimeTest.class/instance/testUnnecessaryWithSentToBrush.st
index e883a79b6..d920a5ef3 100644
--- a/repository/Seaside-Tests-Slime.package/WASlimeTest.class/instance/testUnnecessaryWithSentToBrush.st
+++ b/repository/Seaside-Tests-Slime.package/WASlimeTest.class/instance/testUnnecessaryWithSentToBrush.st
@@ -1,12 +1,10 @@
 tests-parsetree
 testUnnecessaryWithSentToBrush
 	| class |
-	class := self 
-		defineClass: #WASlimeMockComponent
-		superclass: #WAComponent.
-	class
+	class := self defineSubClassOf: #WAComponent.
+	self
 		compile: 'renderContentOn: html html div with: 123'
-		classified: #(rendering).
+		in: class.
 	self
 		runRule: WAUnnecessaryWithSentToBrushRule
 		selectors: #(renderContentOn:)
\ No newline at end of file
diff --git a/repository/Seaside-Tests-Slime.package/WASlimeTest.class/instance/testUsesWrongRenderer.st b/repository/Seaside-Tests-Slime.package/WASlimeTest.class/instance/testUsesWrongRenderer.st
index b1767eaf5..621e4327d 100644
--- a/repository/Seaside-Tests-Slime.package/WASlimeTest.class/instance/testUsesWrongRenderer.st
+++ b/repository/Seaside-Tests-Slime.package/WASlimeTest.class/instance/testUsesWrongRenderer.st
@@ -1,13 +1,11 @@
 tests-parsetree
 testUsesWrongRenderer
 	| class |
-	class := self 
-		defineClass: #WASlimeMockComponent
-		superclass: #WAComponent.
-	class
+	class := self defineSubClassOf: #WAComponent.
+	self
 		compile: 'renderContentOn: html
 			html updater callback: [ :r | html div ]'
-		classified: #(rendering).
+		in: class.
 	self 
 		runRule: WAUsesWrongRendererRule
 		selectors: #(renderContentOn:)
\ No newline at end of file
diff --git a/repository/Seaside-Tests-Slime.package/WASlimeTest.class/instance/testWithHasToBeLastMessageInCascade.st b/repository/Seaside-Tests-Slime.package/WASlimeTest.class/instance/testWithHasToBeLastMessageInCascade.st
index dddb9764a..365ced3e8 100644
--- a/repository/Seaside-Tests-Slime.package/WASlimeTest.class/instance/testWithHasToBeLastMessageInCascade.st
+++ b/repository/Seaside-Tests-Slime.package/WASlimeTest.class/instance/testWithHasToBeLastMessageInCascade.st
@@ -1,22 +1,20 @@
 tests-parsetree
 testWithHasToBeLastMessageInCascade
 	| class |
-	class := self 
-		defineClass: #WASlimeMockComponent
-		superclass: #WAComponent.
-	class
+	class := self defineSubClassOf: #WAComponent.
+	self
 		compile: 'renderContent01On: html
 			html div
 				with: ''foo'';
 				class: ''bar'''
-		classified: #(rendering).
-	class
+		in: class.
+	self
 		compile: 'renderContent02On: html
 			html div
 				id: ''zork'';
 				with: ''foo'';
 				class: ''bar'''
-		classified: #(rendering).
+		in: class.
 	self 
 		runRule: WAWithHasToBeLastMessageInCascadeRule
 		selectors: #(renderContent01On: renderContent02On:)
\ No newline at end of file