diff --git a/source/BaselineOfOpenAPI.package/BaselineOfOpenAPI.class/instance/mocketry..st b/source/BaselineOfOpenAPI.package/BaselineOfOpenAPI.class/instance/mocketry..st
index 86f5fba..9b936cc 100644
--- a/source/BaselineOfOpenAPI.package/BaselineOfOpenAPI.class/instance/mocketry..st
+++ b/source/BaselineOfOpenAPI.package/BaselineOfOpenAPI.class/instance/mocketry..st
@@ -1,4 +1,4 @@
 baselines
 mocketry: spec
 	spec baseline: 'Mocketry' with: [ 
-		spec repository: 'github://dionisiydk/Mocketry:v4.0.x'. ]
\ No newline at end of file
+		spec repository: 'github://dionisiydk/Mocketry:v4.0.x'. ]
diff --git a/source/OpenAPI-Core-Tests.package/OAParsingTests.class/instance/operationObjectJSON.st b/source/OpenAPI-Core-Tests.package/OAParsingTests.class/instance/operationObjectJSON.st
index cf4c2d3..76a3a80 100644
--- a/source/OpenAPI-Core-Tests.package/OAParsingTests.class/instance/operationObjectJSON.st
+++ b/source/OpenAPI-Core-Tests.package/OAParsingTests.class/instance/operationObjectJSON.st
@@ -15,6 +15,14 @@ operationObjectJSON
       "schema": {
         "type": "string"
       }
+    },
+	{
+      "name": "secondId",
+      "in": "query",
+      "description": "an ID to have more than one",
+      "schema": {
+        "type": "string"
+      }
     }
   ],
   "requestBody": {
diff --git a/source/OpenAPI-Core-Tests.package/OAParsingTests.class/instance/petStoreApiJsonString.st b/source/OpenAPI-Core-Tests.package/OAParsingTests.class/instance/petStoreApiJsonString.st
index 7f87aa3..1228baa 100644
--- a/source/OpenAPI-Core-Tests.package/OAParsingTests.class/instance/petStoreApiJsonString.st
+++ b/source/OpenAPI-Core-Tests.package/OAParsingTests.class/instance/petStoreApiJsonString.st
@@ -113,7 +113,15 @@ petStoreApiJsonString
             "schema": {
               "type": "string"
             }
-          }
+          },
+			{
+      			"name": "secondId",
+      			"in": "query",
+      			"description": "just an ID to have more than one",
+      			"schema": {
+        		"type": "string"
+      		}
+    }
         ],
         "responses": {
           "200": {
diff --git a/source/OpenAPI-Core-Tests.package/OAParsingTests.class/instance/testOpenAPISpecHasSortedParameters.st b/source/OpenAPI-Core-Tests.package/OAParsingTests.class/instance/testOpenAPISpecHasSortedParameters.st
new file mode 100644
index 0000000..cc9eef9
--- /dev/null
+++ b/source/OpenAPI-Core-Tests.package/OAParsingTests.class/instance/testOpenAPISpecHasSortedParameters.st
@@ -0,0 +1,10 @@
+tests
+testOpenAPISpecHasSortedParameters
+	| api string json parameters |
+	api := OpenAPI fromString: self petStoreApiJsonString.
+	string := api specString.
+	json := NeoJSONObject fromString: string.
+	parameters := (json paths at: #'/pets/{petId}') get parameters.
+	self assert: parameters size equals: 2.
+	self assert: parameters first name equals: #petId.
+	self assert: parameters second name equals: #secondId
\ No newline at end of file
diff --git a/source/OpenAPI-Core.package/OAHeaderParametersLocation.class/instance/extractParameter..st b/source/OpenAPI-Core.package/OAHeaderParametersLocation.class/instance/extractParameter..st
new file mode 100644
index 0000000..d4d8d0a
--- /dev/null
+++ b/source/OpenAPI-Core.package/OAHeaderParametersLocation.class/instance/extractParameter..st
@@ -0,0 +1,3 @@
+reading
+extractParameter: aCall
+	^ parameter read: (aCall request headers at: parameter name ifAbsent: [ ^ nil ])
\ No newline at end of file
diff --git a/source/OpenAPI-Core.package/OAMediaTypeObject.class/instance/read.object..st b/source/OpenAPI-Core.package/OAMediaTypeObject.class/instance/read.object..st
index 0556d89..23fa05f 100644
--- a/source/OpenAPI-Core.package/OAMediaTypeObject.class/instance/read.object..st
+++ b/source/OpenAPI-Core.package/OAMediaTypeObject.class/instance/read.object..st
@@ -1,3 +1,5 @@
 as yet unclassified
 read: value object: object
-	^ schema read: value object: object
\ No newline at end of file
+	^ [schema read: value object: object] on: JSONSchemaError do: [ :ex |
+			OAInvalidFormat signal: ex description
+		 ]
\ No newline at end of file
diff --git a/source/OpenAPI-Core.package/OAOperation.class/class/neoJsonMapping..st b/source/OpenAPI-Core.package/OAOperation.class/class/neoJsonMapping..st
index 353d9ac..c71636b 100644
--- a/source/OpenAPI-Core.package/OAOperation.class/class/neoJsonMapping..st
+++ b/source/OpenAPI-Core.package/OAOperation.class/class/neoJsonMapping..st
@@ -4,7 +4,7 @@ neoJsonMapping: mapper
 		for: self
 		do: [ :mapping | 
 			mapping mapInstVars: #(tags summary description externalDocs operationId responses callbacks deprecated security servers).
-			(mapping mapInstVar: #parameters) valueSchema: #ParameterList.
+			(mapping mapAccessor: #parametersSortedByName mutator: #parameters: to: #parameters) valueSchema: #ParameterList.
 			(mapping mapInstVar: #requestBody) valueSchema: OARequestBody.
 			(mapping mapAccessor: #responses) valueSchema: #ResponsesDictionary. ].
 	mapper
diff --git a/source/OpenAPI-Core.package/OAOperation.class/instance/deprecated1..st b/source/OpenAPI-Core.package/OAOperation.class/instance/deprecated1..st
deleted file mode 100644
index e5423df..0000000
--- a/source/OpenAPI-Core.package/OAOperation.class/instance/deprecated1..st
+++ /dev/null
@@ -1,3 +0,0 @@
-accessing
-deprecated1: anObject
-	deprecated := anObject
\ No newline at end of file
diff --git a/source/OpenAPI-Core.package/OAOperation.class/instance/initializeValuesOn.fromRequest..st b/source/OpenAPI-Core.package/OAOperation.class/instance/initializeValuesOn.fromRequest..st
index f28d414..bfe277a 100644
--- a/source/OpenAPI-Core.package/OAOperation.class/instance/initializeValuesOn.fromRequest..st
+++ b/source/OpenAPI-Core.package/OAOperation.class/instance/initializeValuesOn.fromRequest..st
@@ -1,7 +1,11 @@
 reading
-initializeValuesOn: object fromRequest: request
+initializeValuesOn: aCall fromRequest: request
 	parameters ifNotNil: [
 		parameters do: [ :each | 
-			each writeParameterValueOn: object request: request]].
+			each 
+				writeParameterValueOn: aCall parameterValueDelegate 
+				request: request]].
 	requestBody ifNotNil: [ 
-		(requestBody readFrom: request object: object) ]
+		(requestBody 
+			readFrom: request 
+			object: aCall bodyValueDelegate ) ]
diff --git a/source/OpenAPI-Core.package/OAOperation.class/instance/parametersSortedByName.st b/source/OpenAPI-Core.package/OAOperation.class/instance/parametersSortedByName.st
new file mode 100644
index 0000000..88a96fe
--- /dev/null
+++ b/source/OpenAPI-Core.package/OAOperation.class/instance/parametersSortedByName.st
@@ -0,0 +1,4 @@
+accessing
+parametersSortedByName
+	parameters ifNil: [ ^ nil ].
+	^ parameters sorted: [ :a :b | a name < b name ]
\ No newline at end of file
diff --git a/source/OpenAPI-Core.package/OAParameter.class/instance/extractParameter..st b/source/OpenAPI-Core.package/OAParameter.class/instance/extractParameter..st
index afd30be..11e31ed 100644
--- a/source/OpenAPI-Core.package/OAParameter.class/instance/extractParameter..st
+++ b/source/OpenAPI-Core.package/OAParameter.class/instance/extractParameter..st
@@ -1,7 +1,9 @@
 accessing
 extractParameter: aCall
 	| value |
-	value := location extractParameter: aCall.
+	value := [location extractParameter: aCall]  on: JSONSchemaError do: [ :ex |
+			OAInvalidFormat signal: ex description
+		 ].
 	value isNil
 		ifTrue: [ required
 				ifTrue: [ OAMissingRequiredParameter signal: 'parameter ' , name , ' is required but not present' ]
diff --git a/source/OpenAPI-Core.package/OAParameter.class/instance/writeParameterValueOn..st b/source/OpenAPI-Core.package/OAParameter.class/instance/writeParameterValueOn..st
deleted file mode 100644
index fc1d97c..0000000
--- a/source/OpenAPI-Core.package/OAParameter.class/instance/writeParameterValueOn..st
+++ /dev/null
@@ -1,11 +0,0 @@
-writing
-writeParameterValueOn: anObject
-	| value |
-	self flag: #todo.
-	"needs to be improved for required or not. If not required we don't write the
-	value. Needs to be checked if that constraint is ok"
-	value := self extractParameter: anObject. 
-	value ifNil: [ ^ self ].
-	self shouldUseAccessors 
-		ifTrue: [ anObject perform: name asSymbol asMutator with: value ]
-		ifFalse: [ anObject instVarNamed: name put: value ]
\ No newline at end of file
diff --git a/source/OpenAPI-Core.package/OAParameter.class/instance/writeParameterValueOn.request..st b/source/OpenAPI-Core.package/OAParameter.class/instance/writeParameterValueOn.request..st
index a365549..77f40bd 100644
--- a/source/OpenAPI-Core.package/OAParameter.class/instance/writeParameterValueOn.request..st
+++ b/source/OpenAPI-Core.package/OAParameter.class/instance/writeParameterValueOn.request..st
@@ -7,5 +7,11 @@ writeParameterValueOn: anObject request: request
 	value := self extractParameter: request. 
 	value ifNil: [ ^ self ].
 	self shouldUseAccessors 
-		ifTrue: [ anObject perform: name asSymbol asMutator with: value ]
-		ifFalse: [ anObject instVarNamed: name put: value ]
\ No newline at end of file
+		ifTrue: [ 
+			anObject 
+				perform: name asValidSelector asMutator 
+				with: value ]
+		ifFalse: [ 
+			anObject 
+				instVarNamed: name asValidSelector 
+				put: value ]
\ No newline at end of file
diff --git a/source/OpenAPI-Core.package/OAPathParameterLocation.class/instance/extractParameter..st b/source/OpenAPI-Core.package/OAPathParameterLocation.class/instance/extractParameter..st
index f6d2e0a..8a65f78 100644
--- a/source/OpenAPI-Core.package/OAPathParameterLocation.class/instance/extractParameter..st
+++ b/source/OpenAPI-Core.package/OAPathParameterLocation.class/instance/extractParameter..st
@@ -1,4 +1,4 @@
-as yet unclassified
+reading
 extractParameter: aCall
 	| index value |
 	($/ split: aCall class path allButFirst) withIndexDo: [ :each :idx |
diff --git a/source/OpenAPI-Core.package/OAPathParameterLocation.class/instance/write.value.to..st b/source/OpenAPI-Core.package/OAPathParameterLocation.class/instance/write.value.to..st
index 0ff8813..3130e90 100644
--- a/source/OpenAPI-Core.package/OAPathParameterLocation.class/instance/write.value.to..st
+++ b/source/OpenAPI-Core.package/OAPathParameterLocation.class/instance/write.value.to..st
@@ -1,3 +1,3 @@
-as yet unclassified
+writing
 write: key value: value to: builder 
 	builder addPathParameter: key value: value
\ No newline at end of file
diff --git a/source/OpenAPI-REST-Tests.package/OARESTTests.class/README.md b/source/OpenAPI-REST-Tests.package/OAMissingHeaderPetCall.class/README.md
similarity index 100%
rename from source/OpenAPI-REST-Tests.package/OARESTTests.class/README.md
rename to source/OpenAPI-REST-Tests.package/OAMissingHeaderPetCall.class/README.md
diff --git a/source/OpenAPI-REST-Tests.package/OAMissingHeaderPetCall.class/class/parameterOptionalPetId.st b/source/OpenAPI-REST-Tests.package/OAMissingHeaderPetCall.class/class/parameterOptionalPetId.st
new file mode 100644
index 0000000..54881ac
--- /dev/null
+++ b/source/OpenAPI-REST-Tests.package/OAMissingHeaderPetCall.class/class/parameterOptionalPetId.st
@@ -0,0 +1,9 @@
+accessing
+parameterOptionalPetId
+	<openApiParameter: #( common )>
+	^ OAParameter new
+		name: 'Optional-Pet-Id';
+		in: #header;
+		beInteger;
+		required: false;
+		description: 'The internal id of the pet in the pet store'
diff --git a/source/OpenAPI-REST-Tests.package/OAMissingHeaderPetCall.class/class/parameterRequiredPetId.st b/source/OpenAPI-REST-Tests.package/OAMissingHeaderPetCall.class/class/parameterRequiredPetId.st
new file mode 100644
index 0000000..859f6bc
--- /dev/null
+++ b/source/OpenAPI-REST-Tests.package/OAMissingHeaderPetCall.class/class/parameterRequiredPetId.st
@@ -0,0 +1,9 @@
+accessing
+parameterRequiredPetId
+	<openApiParameter: #( common )>
+	^ OAParameter new
+		name: 'Required-Pet-Id';
+		in: #header;
+		beInteger;
+		required: true;
+		description: 'The internal id of the pet in the pet store'
diff --git a/source/OpenAPI-REST-Tests.package/OAMissingHeaderPetCall.class/class/path.st b/source/OpenAPI-REST-Tests.package/OAMissingHeaderPetCall.class/class/path.st
new file mode 100644
index 0000000..fedb27c
--- /dev/null
+++ b/source/OpenAPI-REST-Tests.package/OAMissingHeaderPetCall.class/class/path.st
@@ -0,0 +1,3 @@
+accessing
+path 
+	^ '/pets/header-missing'
\ No newline at end of file
diff --git a/source/OpenAPI-REST.package/OpenAPIPetCall.class/class/responseOk.st b/source/OpenAPI-REST-Tests.package/OAMissingHeaderPetCall.class/class/responseOk.st
similarity index 100%
rename from source/OpenAPI-REST.package/OpenAPIPetCall.class/class/responseOk.st
rename to source/OpenAPI-REST-Tests.package/OAMissingHeaderPetCall.class/class/responseOk.st
diff --git a/source/OpenAPI-REST-Tests.package/OAMissingHeaderPetCall.class/instance/get.st b/source/OpenAPI-REST-Tests.package/OAMissingHeaderPetCall.class/instance/get.st
new file mode 100644
index 0000000..6978308
--- /dev/null
+++ b/source/OpenAPI-REST-Tests.package/OAMissingHeaderPetCall.class/instance/get.st
@@ -0,0 +1,3 @@
+public
+get
+	response := self response: Dictionary new status: 200 contentType: 'application/json'
\ No newline at end of file
diff --git a/source/OpenAPI-REST-Tests.package/OARESTTests.class/properties.json b/source/OpenAPI-REST-Tests.package/OAMissingHeaderPetCall.class/properties.json
similarity index 63%
rename from source/OpenAPI-REST-Tests.package/OARESTTests.class/properties.json
rename to source/OpenAPI-REST-Tests.package/OAMissingHeaderPetCall.class/properties.json
index e9a5909..9e0f844 100644
--- a/source/OpenAPI-REST-Tests.package/OARESTTests.class/properties.json
+++ b/source/OpenAPI-REST-Tests.package/OAMissingHeaderPetCall.class/properties.json
@@ -1,15 +1,13 @@
 {
 	"commentStamp" : "",
-	"super" : "TestCase",
+	"super" : "OpenAPITestCall",
 	"category" : "OpenAPI-REST-Tests",
 	"classinstvars" : [ ],
 	"pools" : [ ],
 	"classvars" : [ ],
 	"instvars" : [
-		"serverDelegate",
-		"server",
-		"client"
+		"requiredPetId"
 	],
-	"name" : "OARESTTests",
+	"name" : "OAMissingHeaderPetCall",
 	"type" : "normal"
 }
\ No newline at end of file
diff --git a/source/OpenAPI-REST-Tests.package/OARESTTests.class/instance/setUp.st b/source/OpenAPI-REST-Tests.package/OARESTTests.class/instance/setUp.st
deleted file mode 100644
index 80d3562..0000000
--- a/source/OpenAPI-REST-Tests.package/OARESTTests.class/instance/setUp.st
+++ /dev/null
@@ -1,12 +0,0 @@
-running
-setUp
-	super setUp.
-	server := ZnServer startOn: 1700 + 10 atRandom.
-	server delegate: 
-		(ZnRestServerDelegate new 
-			uriSpace: ( OpenAPIUriSpace new 
-				rootClass: OpenAPICall;
-				yourself )).
-	client := ZnClient new
-		url: server localUrl;
-		yourself
diff --git a/source/OpenAPI-REST-Tests.package/OARESTTests.class/instance/tearDown.st b/source/OpenAPI-REST-Tests.package/OARESTTests.class/instance/tearDown.st
deleted file mode 100644
index e5ace0a..0000000
--- a/source/OpenAPI-REST-Tests.package/OARESTTests.class/instance/tearDown.st
+++ /dev/null
@@ -1,4 +0,0 @@
-running
-tearDown
-	client close.
-	server stop
\ No newline at end of file
diff --git a/source/OpenAPI-REST-Tests.package/OARESTTests.class/instance/testPetCall.st b/source/OpenAPI-REST-Tests.package/OARESTTests.class/instance/testPetCall.st
deleted file mode 100644
index 377241e..0000000
--- a/source/OpenAPI-REST-Tests.package/OARESTTests.class/instance/testPetCall.st
+++ /dev/null
@@ -1,5 +0,0 @@
-tests
-testPetCall
-
-	client request url addPathSegments: #( pets #abc ).
-	client get.
diff --git a/source/OpenAPI-REST-Tests.package/OARESTTests.class/instance/testPetPostCall.st b/source/OpenAPI-REST-Tests.package/OARESTTests.class/instance/testPetPostCall.st
deleted file mode 100644
index 0ae2dd3..0000000
--- a/source/OpenAPI-REST-Tests.package/OARESTTests.class/instance/testPetPostCall.st
+++ /dev/null
@@ -1,8 +0,0 @@
-tests
-testPetPostCall
-
-	client request url addPathSegments: #( pets ).
-	client entity: (ZnEntity 
-		with: '{ "name" : "fiffi" , "age" : 8 }'
-		type: ZnMimeType applicationJson).
-	client post.
diff --git a/source/OpenAPI-REST.package/OpenAPIPetCall.class/README.md b/source/OpenAPI-REST-Tests.package/OpenAPIBasePetCall.class/README.md
similarity index 100%
rename from source/OpenAPI-REST.package/OpenAPIPetCall.class/README.md
rename to source/OpenAPI-REST-Tests.package/OpenAPIBasePetCall.class/README.md
diff --git a/source/OpenAPI-REST-Tests.package/OpenAPIBasePetCall.class/properties.json b/source/OpenAPI-REST-Tests.package/OpenAPIBasePetCall.class/properties.json
new file mode 100644
index 0000000..532f008
--- /dev/null
+++ b/source/OpenAPI-REST-Tests.package/OpenAPIBasePetCall.class/properties.json
@@ -0,0 +1,11 @@
+{
+	"commentStamp" : "",
+	"super" : "OpenAPICall",
+	"category" : "OpenAPI-REST-Tests",
+	"classinstvars" : [ ],
+	"pools" : [ ],
+	"classvars" : [ ],
+	"instvars" : [ ],
+	"name" : "OpenAPIBasePetCall",
+	"type" : "normal"
+}
\ No newline at end of file
diff --git a/source/OpenAPI-REST.package/OpenAPIPetCollectionCall.class/README.md b/source/OpenAPI-REST-Tests.package/OpenAPIHeaderTests.class/README.md
similarity index 100%
rename from source/OpenAPI-REST.package/OpenAPIPetCollectionCall.class/README.md
rename to source/OpenAPI-REST-Tests.package/OpenAPIHeaderTests.class/README.md
diff --git a/source/OpenAPI-REST-Tests.package/OpenAPIHeaderTests.class/instance/testMissingOptionalHeaderParameter.st b/source/OpenAPI-REST-Tests.package/OpenAPIHeaderTests.class/instance/testMissingOptionalHeaderParameter.st
new file mode 100644
index 0000000..e6123fc
--- /dev/null
+++ b/source/OpenAPI-REST-Tests.package/OpenAPIHeaderTests.class/instance/testMissingOptionalHeaderParameter.st
@@ -0,0 +1,13 @@
+tests
+testMissingOptionalHeaderParameter
+	 
+	| response |
+	Pet instances add: (Pet new id: 1; name: 'testpet'; age: 1).
+	response := self delegate handleRequest: (ZnClient new
+		url: '/pets/header-missing';
+		headerAt: 'Required-Pet-Id' add: '123';
+		method: #GET;
+		prepareRequest) request.
+	self assert: response isSuccess 
+
+			
\ No newline at end of file
diff --git a/source/OpenAPI-REST-Tests.package/OpenAPIHeaderTests.class/instance/testMissingRequiredHeaderParameter.st b/source/OpenAPI-REST-Tests.package/OpenAPIHeaderTests.class/instance/testMissingRequiredHeaderParameter.st
new file mode 100644
index 0000000..0a35bfa
--- /dev/null
+++ b/source/OpenAPI-REST-Tests.package/OpenAPIHeaderTests.class/instance/testMissingRequiredHeaderParameter.st
@@ -0,0 +1,14 @@
+tests
+testMissingRequiredHeaderParameter
+	 
+	| response |
+	Pet instances add: (Pet new id: 1; name: 'testpet'; age: 1).
+	response := self delegate handleRequest: (ZnClient new
+		url: '/pets/header-missing';
+		method: #GET;
+		prepareRequest) request.
+	self deny: response isSuccess.
+	self assert: response status equals: 400.
+	self assert: (response contents includesSubstring: 'Required-Pet-Id')
+
+			
\ No newline at end of file
diff --git a/source/OpenAPI-REST-Tests.package/OpenAPIHeaderTests.class/properties.json b/source/OpenAPI-REST-Tests.package/OpenAPIHeaderTests.class/properties.json
new file mode 100644
index 0000000..6cb1b58
--- /dev/null
+++ b/source/OpenAPI-REST-Tests.package/OpenAPIHeaderTests.class/properties.json
@@ -0,0 +1,11 @@
+{
+	"commentStamp" : "",
+	"super" : "OpenAPIRestTests",
+	"category" : "OpenAPI-REST-Tests",
+	"classinstvars" : [ ],
+	"pools" : [ ],
+	"classvars" : [ ],
+	"instvars" : [ ],
+	"name" : "OpenAPIHeaderTests",
+	"type" : "normal"
+}
\ No newline at end of file
diff --git a/source/OpenAPI-REST.package/OpenAPIRestTest.class/README.md b/source/OpenAPI-REST-Tests.package/OpenAPIPetCall.class/README.md
similarity index 100%
rename from source/OpenAPI-REST.package/OpenAPIRestTest.class/README.md
rename to source/OpenAPI-REST-Tests.package/OpenAPIPetCall.class/README.md
diff --git a/source/OpenAPI-REST.package/OpenAPIPetCall.class/class/description.st b/source/OpenAPI-REST-Tests.package/OpenAPIPetCall.class/class/description.st
similarity index 100%
rename from source/OpenAPI-REST.package/OpenAPIPetCall.class/class/description.st
rename to source/OpenAPI-REST-Tests.package/OpenAPIPetCall.class/class/description.st
diff --git a/source/OpenAPI-REST.package/OpenAPIPetCall.class/class/getDescription.st b/source/OpenAPI-REST-Tests.package/OpenAPIPetCall.class/class/getDescription.st
similarity index 100%
rename from source/OpenAPI-REST.package/OpenAPIPetCall.class/class/getDescription.st
rename to source/OpenAPI-REST-Tests.package/OpenAPIPetCall.class/class/getDescription.st
diff --git a/source/OpenAPI-REST.package/OpenAPIPetCall.class/class/getSummary.st b/source/OpenAPI-REST-Tests.package/OpenAPIPetCall.class/class/getSummary.st
similarity index 100%
rename from source/OpenAPI-REST.package/OpenAPIPetCall.class/class/getSummary.st
rename to source/OpenAPI-REST-Tests.package/OpenAPIPetCall.class/class/getSummary.st
diff --git a/source/OpenAPI-REST.package/OpenAPIPetCall.class/class/parameterPetId.st b/source/OpenAPI-REST-Tests.package/OpenAPIPetCall.class/class/parameterPetId.st
similarity index 100%
rename from source/OpenAPI-REST.package/OpenAPIPetCall.class/class/parameterPetId.st
rename to source/OpenAPI-REST-Tests.package/OpenAPIPetCall.class/class/parameterPetId.st
diff --git a/source/OpenAPI-REST.package/OpenAPIPetCall.class/class/path.st b/source/OpenAPI-REST-Tests.package/OpenAPIPetCall.class/class/path.st
similarity index 100%
rename from source/OpenAPI-REST.package/OpenAPIPetCall.class/class/path.st
rename to source/OpenAPI-REST-Tests.package/OpenAPIPetCall.class/class/path.st
diff --git a/source/OpenAPI-REST-Tests.package/OpenAPIPetCall.class/class/responseOk.st b/source/OpenAPI-REST-Tests.package/OpenAPIPetCall.class/class/responseOk.st
new file mode 100644
index 0000000..57ab2d2
--- /dev/null
+++ b/source/OpenAPI-REST-Tests.package/OpenAPIPetCall.class/class/responseOk.st
@@ -0,0 +1,7 @@
+as yet unclassified
+responseOk
+	<openApiResponse: #(get) status: #(200) contentType: #('application/json')>
+	^ OAMediaTypeObject new
+		schema: { 
+			#name -> (JSONSchema string).
+			#age -> (JSONSchema integer) } asJSONSchema
\ No newline at end of file
diff --git a/source/OpenAPI-REST.package/OpenAPIPetCall.class/class/summary.st b/source/OpenAPI-REST-Tests.package/OpenAPIPetCall.class/class/summary.st
similarity index 100%
rename from source/OpenAPI-REST.package/OpenAPIPetCall.class/class/summary.st
rename to source/OpenAPI-REST-Tests.package/OpenAPIPetCall.class/class/summary.st
diff --git a/source/OpenAPI-REST.package/OpenAPIPetCall.class/instance/get.st b/source/OpenAPI-REST-Tests.package/OpenAPIPetCall.class/instance/get.st
similarity index 100%
rename from source/OpenAPI-REST.package/OpenAPIPetCall.class/instance/get.st
rename to source/OpenAPI-REST-Tests.package/OpenAPIPetCall.class/instance/get.st
diff --git a/source/OpenAPI-REST.package/OpenAPIPetCall.class/properties.json b/source/OpenAPI-REST-Tests.package/OpenAPIPetCall.class/properties.json
similarity index 70%
rename from source/OpenAPI-REST.package/OpenAPIPetCall.class/properties.json
rename to source/OpenAPI-REST-Tests.package/OpenAPIPetCall.class/properties.json
index 51d4779..b7ce2d0 100644
--- a/source/OpenAPI-REST.package/OpenAPIPetCall.class/properties.json
+++ b/source/OpenAPI-REST-Tests.package/OpenAPIPetCall.class/properties.json
@@ -1,7 +1,7 @@
 {
 	"commentStamp" : "",
-	"super" : "OpenAPICall",
-	"category" : "OpenAPI-REST",
+	"super" : "OpenAPIBasePetCall",
+	"category" : "OpenAPI-REST-Tests",
 	"classinstvars" : [ ],
 	"pools" : [ ],
 	"classvars" : [ ],
diff --git a/source/OpenAPI-REST.package/OpenAPISpecCall.class/README.md b/source/OpenAPI-REST-Tests.package/OpenAPIPetCollectionCall.class/README.md
similarity index 100%
rename from source/OpenAPI-REST.package/OpenAPISpecCall.class/README.md
rename to source/OpenAPI-REST-Tests.package/OpenAPIPetCollectionCall.class/README.md
diff --git a/source/OpenAPI-REST.package/OpenAPIPetCollectionCall.class/class/path.st b/source/OpenAPI-REST-Tests.package/OpenAPIPetCollectionCall.class/class/path.st
similarity index 100%
rename from source/OpenAPI-REST.package/OpenAPIPetCollectionCall.class/class/path.st
rename to source/OpenAPI-REST-Tests.package/OpenAPIPetCollectionCall.class/class/path.st
diff --git a/source/OpenAPI-REST.package/OpenAPIPetCollectionCall.class/class/requestBody.st b/source/OpenAPI-REST-Tests.package/OpenAPIPetCollectionCall.class/class/requestBody.st
similarity index 100%
rename from source/OpenAPI-REST.package/OpenAPIPetCollectionCall.class/class/requestBody.st
rename to source/OpenAPI-REST-Tests.package/OpenAPIPetCollectionCall.class/class/requestBody.st
diff --git a/source/OpenAPI-REST.package/OpenAPIPetCollectionCall.class/class/requestBodyJson.st b/source/OpenAPI-REST-Tests.package/OpenAPIPetCollectionCall.class/class/requestBodyJson.st
similarity index 100%
rename from source/OpenAPI-REST.package/OpenAPIPetCollectionCall.class/class/requestBodyJson.st
rename to source/OpenAPI-REST-Tests.package/OpenAPIPetCollectionCall.class/class/requestBodyJson.st
diff --git a/source/OpenAPI-REST.package/OpenAPIPetCollectionCall.class/instance/post.st b/source/OpenAPI-REST-Tests.package/OpenAPIPetCollectionCall.class/instance/post.st
similarity index 100%
rename from source/OpenAPI-REST.package/OpenAPIPetCollectionCall.class/instance/post.st
rename to source/OpenAPI-REST-Tests.package/OpenAPIPetCollectionCall.class/instance/post.st
diff --git a/source/OpenAPI-REST.package/OpenAPIPetCollectionCall.class/instance/valueDelegate.st b/source/OpenAPI-REST-Tests.package/OpenAPIPetCollectionCall.class/instance/valueDelegate.st
similarity index 100%
rename from source/OpenAPI-REST.package/OpenAPIPetCollectionCall.class/instance/valueDelegate.st
rename to source/OpenAPI-REST-Tests.package/OpenAPIPetCollectionCall.class/instance/valueDelegate.st
diff --git a/source/OpenAPI-REST.package/OpenAPIPetCollectionCall.class/properties.json b/source/OpenAPI-REST-Tests.package/OpenAPIPetCollectionCall.class/properties.json
similarity index 73%
rename from source/OpenAPI-REST.package/OpenAPIPetCollectionCall.class/properties.json
rename to source/OpenAPI-REST-Tests.package/OpenAPIPetCollectionCall.class/properties.json
index ff5497e..c43bc81 100644
--- a/source/OpenAPI-REST.package/OpenAPIPetCollectionCall.class/properties.json
+++ b/source/OpenAPI-REST-Tests.package/OpenAPIPetCollectionCall.class/properties.json
@@ -1,7 +1,7 @@
 {
 	"commentStamp" : "",
-	"super" : "OpenAPICall",
-	"category" : "OpenAPI-REST",
+	"super" : "OpenAPIBasePetCall",
+	"category" : "OpenAPI-REST-Tests",
 	"classinstvars" : [ ],
 	"pools" : [ ],
 	"classvars" : [ ],
diff --git a/source/OpenAPI-REST.package/Pet.class/README.md b/source/OpenAPI-REST-Tests.package/OpenAPIRestPetTests.class/README.md
similarity index 100%
rename from source/OpenAPI-REST.package/Pet.class/README.md
rename to source/OpenAPI-REST-Tests.package/OpenAPIRestPetTests.class/README.md
diff --git a/source/OpenAPI-REST-Tests.package/OpenAPIRestPetTests.class/instance/rootCallClass.st b/source/OpenAPI-REST-Tests.package/OpenAPIRestPetTests.class/instance/rootCallClass.st
new file mode 100644
index 0000000..39192d3
--- /dev/null
+++ b/source/OpenAPI-REST-Tests.package/OpenAPIRestPetTests.class/instance/rootCallClass.st
@@ -0,0 +1,3 @@
+tests
+rootCallClass
+	^ OpenAPIBasePetCall
\ No newline at end of file
diff --git a/source/OpenAPI-REST.package/OpenAPIRestTest.class/instance/testGetPetCall.st b/source/OpenAPI-REST-Tests.package/OpenAPIRestPetTests.class/instance/testGetPetCall.st
similarity index 100%
rename from source/OpenAPI-REST.package/OpenAPIRestTest.class/instance/testGetPetCall.st
rename to source/OpenAPI-REST-Tests.package/OpenAPIRestPetTests.class/instance/testGetPetCall.st
diff --git a/source/OpenAPI-REST.package/OpenAPIRestTest.class/instance/testPostPetCall.st b/source/OpenAPI-REST-Tests.package/OpenAPIRestPetTests.class/instance/testPostPetCall.st
similarity index 100%
rename from source/OpenAPI-REST.package/OpenAPIRestTest.class/instance/testPostPetCall.st
rename to source/OpenAPI-REST-Tests.package/OpenAPIRestPetTests.class/instance/testPostPetCall.st
diff --git a/source/OpenAPI-REST-Tests.package/OpenAPIRestPetTests.class/properties.json b/source/OpenAPI-REST-Tests.package/OpenAPIRestPetTests.class/properties.json
new file mode 100644
index 0000000..4323855
--- /dev/null
+++ b/source/OpenAPI-REST-Tests.package/OpenAPIRestPetTests.class/properties.json
@@ -0,0 +1,11 @@
+{
+	"commentStamp" : "",
+	"super" : "OpenAPIRestTests",
+	"category" : "OpenAPI-REST-Tests",
+	"classinstvars" : [ ],
+	"pools" : [ ],
+	"classvars" : [ ],
+	"instvars" : [ ],
+	"name" : "OpenAPIRestPetTests",
+	"type" : "normal"
+}
\ No newline at end of file
diff --git a/source/OpenAPI-REST-Tests.package/OpenAPIRestTests.class/README.md b/source/OpenAPI-REST-Tests.package/OpenAPIRestTests.class/README.md
new file mode 100644
index 0000000..e69de29
diff --git a/source/OpenAPI-REST.package/OpenAPIRestTest.class/instance/debugMode.st b/source/OpenAPI-REST-Tests.package/OpenAPIRestTests.class/instance/debugMode.st
similarity index 100%
rename from source/OpenAPI-REST.package/OpenAPIRestTest.class/instance/debugMode.st
rename to source/OpenAPI-REST-Tests.package/OpenAPIRestTests.class/instance/debugMode.st
diff --git a/source/OpenAPI-REST.package/OpenAPIRestTest.class/instance/delegate.st b/source/OpenAPI-REST-Tests.package/OpenAPIRestTests.class/instance/delegate.st
similarity index 68%
rename from source/OpenAPI-REST.package/OpenAPIRestTest.class/instance/delegate.st
rename to source/OpenAPI-REST-Tests.package/OpenAPIRestTests.class/instance/delegate.st
index c738347..4be710f 100644
--- a/source/OpenAPI-REST.package/OpenAPIRestTest.class/instance/delegate.st
+++ b/source/OpenAPI-REST-Tests.package/OpenAPIRestTests.class/instance/delegate.st
@@ -3,4 +3,4 @@ delegate
 
 	^ (ZnRestServerDelegate new
 			uriSpace: (OpenAPIUriSpace new
-				rootClass: OpenAPICall ))
\ No newline at end of file
+				rootClass: self rootCallClass ))
\ No newline at end of file
diff --git a/source/OpenAPI-REST-Tests.package/OpenAPIRestTests.class/instance/rootCallClass.st b/source/OpenAPI-REST-Tests.package/OpenAPIRestTests.class/instance/rootCallClass.st
new file mode 100644
index 0000000..ae0a49b
--- /dev/null
+++ b/source/OpenAPI-REST-Tests.package/OpenAPIRestTests.class/instance/rootCallClass.st
@@ -0,0 +1,3 @@
+tests
+rootCallClass
+	^ OpenAPITestCall
\ No newline at end of file
diff --git a/source/OpenAPI-REST.package/OpenAPIRestTest.class/instance/runCase.st b/source/OpenAPI-REST-Tests.package/OpenAPIRestTests.class/instance/runCase.st
similarity index 100%
rename from source/OpenAPI-REST.package/OpenAPIRestTest.class/instance/runCase.st
rename to source/OpenAPI-REST-Tests.package/OpenAPIRestTests.class/instance/runCase.st
diff --git a/source/OpenAPI-REST.package/OpenAPIRestTest.class/properties.json b/source/OpenAPI-REST-Tests.package/OpenAPIRestTests.class/properties.json
similarity index 68%
rename from source/OpenAPI-REST.package/OpenAPIRestTest.class/properties.json
rename to source/OpenAPI-REST-Tests.package/OpenAPIRestTests.class/properties.json
index db6c42b..ad63a89 100644
--- a/source/OpenAPI-REST.package/OpenAPIRestTest.class/properties.json
+++ b/source/OpenAPI-REST-Tests.package/OpenAPIRestTests.class/properties.json
@@ -1,11 +1,11 @@
 {
 	"commentStamp" : "",
 	"super" : "TestCase",
-	"category" : "OpenAPI-REST",
+	"category" : "OpenAPI-REST-Tests",
 	"classinstvars" : [ ],
 	"pools" : [ ],
 	"classvars" : [ ],
 	"instvars" : [ ],
-	"name" : "OpenAPIRestTest",
+	"name" : "OpenAPIRestTests",
 	"type" : "normal"
 }
\ No newline at end of file
diff --git a/source/OpenAPI-REST-Tests.package/OpenAPISpecCall.class/README.md b/source/OpenAPI-REST-Tests.package/OpenAPISpecCall.class/README.md
new file mode 100644
index 0000000..e69de29
diff --git a/source/OpenAPI-REST.package/OpenAPISpecCall.class/class/path.st b/source/OpenAPI-REST-Tests.package/OpenAPISpecCall.class/class/path.st
similarity index 100%
rename from source/OpenAPI-REST.package/OpenAPISpecCall.class/class/path.st
rename to source/OpenAPI-REST-Tests.package/OpenAPISpecCall.class/class/path.st
diff --git a/source/OpenAPI-REST.package/OpenAPISpecCall.class/instance/get.st b/source/OpenAPI-REST-Tests.package/OpenAPISpecCall.class/instance/get.st
similarity index 100%
rename from source/OpenAPI-REST.package/OpenAPISpecCall.class/instance/get.st
rename to source/OpenAPI-REST-Tests.package/OpenAPISpecCall.class/instance/get.st
diff --git a/source/OpenAPI-REST-Tests.package/OpenAPISpecCall.class/properties.json b/source/OpenAPI-REST-Tests.package/OpenAPISpecCall.class/properties.json
new file mode 100644
index 0000000..0afa703
--- /dev/null
+++ b/source/OpenAPI-REST-Tests.package/OpenAPISpecCall.class/properties.json
@@ -0,0 +1,11 @@
+{
+	"commentStamp" : "",
+	"super" : "OpenAPIBasePetCall",
+	"category" : "OpenAPI-REST-Tests",
+	"classinstvars" : [ ],
+	"pools" : [ ],
+	"classvars" : [ ],
+	"instvars" : [ ],
+	"name" : "OpenAPISpecCall",
+	"type" : "normal"
+}
\ No newline at end of file
diff --git a/source/OpenAPI-REST-Tests.package/OpenAPITestCall.class/README.md b/source/OpenAPI-REST-Tests.package/OpenAPITestCall.class/README.md
new file mode 100644
index 0000000..e69de29
diff --git a/source/OpenAPI-REST.package/OpenAPISpecCall.class/properties.json b/source/OpenAPI-REST-Tests.package/OpenAPITestCall.class/properties.json
similarity index 69%
rename from source/OpenAPI-REST.package/OpenAPISpecCall.class/properties.json
rename to source/OpenAPI-REST-Tests.package/OpenAPITestCall.class/properties.json
index be46fff..65d5d49 100644
--- a/source/OpenAPI-REST.package/OpenAPISpecCall.class/properties.json
+++ b/source/OpenAPI-REST-Tests.package/OpenAPITestCall.class/properties.json
@@ -1,11 +1,11 @@
 {
 	"commentStamp" : "",
 	"super" : "OpenAPICall",
-	"category" : "OpenAPI-REST",
+	"category" : "OpenAPI-REST-Tests",
 	"classinstvars" : [ ],
 	"pools" : [ ],
 	"classvars" : [ ],
 	"instvars" : [ ],
-	"name" : "OpenAPISpecCall",
+	"name" : "OpenAPITestCall",
 	"type" : "normal"
 }
\ No newline at end of file
diff --git a/source/OpenAPI-REST-Tests.package/Pet.class/README.md b/source/OpenAPI-REST-Tests.package/Pet.class/README.md
new file mode 100644
index 0000000..e69de29
diff --git a/source/OpenAPI-REST.package/Pet.class/class/instanceWithId..st b/source/OpenAPI-REST-Tests.package/Pet.class/class/instanceWithId..st
similarity index 100%
rename from source/OpenAPI-REST.package/Pet.class/class/instanceWithId..st
rename to source/OpenAPI-REST-Tests.package/Pet.class/class/instanceWithId..st
diff --git a/source/OpenAPI-REST.package/Pet.class/class/instances.st b/source/OpenAPI-REST-Tests.package/Pet.class/class/instances.st
similarity index 100%
rename from source/OpenAPI-REST.package/Pet.class/class/instances.st
rename to source/OpenAPI-REST-Tests.package/Pet.class/class/instances.st
diff --git a/source/OpenAPI-REST.package/Pet.class/class/neoJsonMapping..st b/source/OpenAPI-REST-Tests.package/Pet.class/class/neoJsonMapping..st
similarity index 100%
rename from source/OpenAPI-REST.package/Pet.class/class/neoJsonMapping..st
rename to source/OpenAPI-REST-Tests.package/Pet.class/class/neoJsonMapping..st
diff --git a/source/OpenAPI-REST.package/Pet.class/class/resetInstances.st b/source/OpenAPI-REST-Tests.package/Pet.class/class/resetInstances.st
similarity index 100%
rename from source/OpenAPI-REST.package/Pet.class/class/resetInstances.st
rename to source/OpenAPI-REST-Tests.package/Pet.class/class/resetInstances.st
diff --git a/source/OpenAPI-REST.package/Pet.class/instance/age..st b/source/OpenAPI-REST-Tests.package/Pet.class/instance/age..st
similarity index 100%
rename from source/OpenAPI-REST.package/Pet.class/instance/age..st
rename to source/OpenAPI-REST-Tests.package/Pet.class/instance/age..st
diff --git a/source/OpenAPI-REST.package/Pet.class/instance/age.st b/source/OpenAPI-REST-Tests.package/Pet.class/instance/age.st
similarity index 100%
rename from source/OpenAPI-REST.package/Pet.class/instance/age.st
rename to source/OpenAPI-REST-Tests.package/Pet.class/instance/age.st
diff --git a/source/OpenAPI-REST.package/Pet.class/instance/id..st b/source/OpenAPI-REST-Tests.package/Pet.class/instance/id..st
similarity index 100%
rename from source/OpenAPI-REST.package/Pet.class/instance/id..st
rename to source/OpenAPI-REST-Tests.package/Pet.class/instance/id..st
diff --git a/source/OpenAPI-REST.package/Pet.class/instance/id.st b/source/OpenAPI-REST-Tests.package/Pet.class/instance/id.st
similarity index 100%
rename from source/OpenAPI-REST.package/Pet.class/instance/id.st
rename to source/OpenAPI-REST-Tests.package/Pet.class/instance/id.st
diff --git a/source/OpenAPI-REST.package/Pet.class/instance/name..st b/source/OpenAPI-REST-Tests.package/Pet.class/instance/name..st
similarity index 100%
rename from source/OpenAPI-REST.package/Pet.class/instance/name..st
rename to source/OpenAPI-REST-Tests.package/Pet.class/instance/name..st
diff --git a/source/OpenAPI-REST.package/Pet.class/instance/name.st b/source/OpenAPI-REST-Tests.package/Pet.class/instance/name.st
similarity index 100%
rename from source/OpenAPI-REST.package/Pet.class/instance/name.st
rename to source/OpenAPI-REST-Tests.package/Pet.class/instance/name.st
diff --git a/source/OpenAPI-REST.package/Pet.class/instance/store.st b/source/OpenAPI-REST-Tests.package/Pet.class/instance/store.st
similarity index 100%
rename from source/OpenAPI-REST.package/Pet.class/instance/store.st
rename to source/OpenAPI-REST-Tests.package/Pet.class/instance/store.st
diff --git a/source/OpenAPI-REST.package/Pet.class/properties.json b/source/OpenAPI-REST-Tests.package/Pet.class/properties.json
similarity index 84%
rename from source/OpenAPI-REST.package/Pet.class/properties.json
rename to source/OpenAPI-REST-Tests.package/Pet.class/properties.json
index 9e94b67..0ba671e 100644
--- a/source/OpenAPI-REST.package/Pet.class/properties.json
+++ b/source/OpenAPI-REST-Tests.package/Pet.class/properties.json
@@ -1,7 +1,7 @@
 {
 	"commentStamp" : "",
 	"super" : "Object",
-	"category" : "OpenAPI-REST",
+	"category" : "OpenAPI-REST-Tests",
 	"classinstvars" : [
 		"instances"
 	],
diff --git a/source/OpenAPI-REST.package/OpenAPICall.class/instance/bodyValueDelegate.st b/source/OpenAPI-REST.package/OpenAPICall.class/instance/bodyValueDelegate.st
new file mode 100644
index 0000000..56bb8a6
--- /dev/null
+++ b/source/OpenAPI-REST.package/OpenAPICall.class/instance/bodyValueDelegate.st
@@ -0,0 +1,3 @@
+accessing
+bodyValueDelegate
+	^ self valueDelegate
\ No newline at end of file
diff --git a/source/OpenAPI-REST.package/OpenAPICall.class/instance/initializeParameters.st b/source/OpenAPI-REST.package/OpenAPICall.class/instance/initializeParameters.st
index 333e652..8ca79cf 100644
--- a/source/OpenAPI-REST.package/OpenAPICall.class/instance/initializeParameters.st
+++ b/source/OpenAPI-REST.package/OpenAPICall.class/instance/initializeParameters.st
@@ -2,5 +2,5 @@ initialization
 initializeParameters
 
 	self operation 
-		initializeValuesOn: self valueDelegate
+		initializeValuesOn: self
 		fromRequest: self
\ No newline at end of file
diff --git a/source/OpenAPI-REST.package/OpenAPICall.class/instance/parameterValueDelegate.st b/source/OpenAPI-REST.package/OpenAPICall.class/instance/parameterValueDelegate.st
new file mode 100644
index 0000000..8675cc2
--- /dev/null
+++ b/source/OpenAPI-REST.package/OpenAPICall.class/instance/parameterValueDelegate.st
@@ -0,0 +1,3 @@
+accessing
+parameterValueDelegate
+	^ self valueDelegate
\ No newline at end of file