diff --git a/coserv/coserv_test.go b/coserv/coserv_test.go
index df3737c5..0a035469 100644
--- a/coserv/coserv_test.go
+++ b/coserv/coserv_test.go
@@ -27,9 +27,6 @@ func TestCoserv_ToCBOR_rv_class_simple(t *testing.T) {
 	query, err := NewQuery(ArtifactTypeReferenceValues, *envSelector, ResultTypeSourceArtifacts)
 	require.NoError(t, err)
 
-	// overwrite the default query timestamp
-	query.SetTimestamp(testTimestamp)
-
 	tv, err := NewCoserv(
 		`tag:example.com,2025:cc-platform#1.0.0`,
 		*query,
@@ -47,9 +44,6 @@ func TestCoserv_ToCBOR_exampleClassSelector(t *testing.T) {
 	query, err := NewQuery(ArtifactTypeReferenceValues, *exampleClassSelector(t), ResultTypeCollectedArtifacts)
 	require.NoError(t, err)
 
-	// overwrite the default query timestamp
-	query.SetTimestamp(testTimestamp)
-
 	tv, err := NewCoserv(
 		`tag:example.com,2025:cc-platform#1.0.0`,
 		*query,
@@ -71,9 +65,6 @@ func TestCoserv_ToCBOR_exampleInstanceSelector(t *testing.T) {
 	query, err := NewQuery(ArtifactTypeReferenceValues, *exampleInstanceSelector(t), ResultTypeBoth)
 	require.NoError(t, err)
 
-	// overwrite the default query timestamp
-	query.SetTimestamp(testTimestamp)
-
 	tv, err := NewCoserv(
 		`tag:example.com,2025:cc-platform#1.0.0`,
 		*query,
@@ -91,9 +82,6 @@ func TestCoserv_ToCBOR_exampleGroupSelector(t *testing.T) {
 	query, err := NewQuery(ArtifactTypeReferenceValues, *exampleGroupSelector(t), ResultTypeSourceArtifacts)
 	require.NoError(t, err)
 
-	// overwrite the default query timestamp
-	query.SetTimestamp(testTimestamp)
-
 	tv, err := NewCoserv(
 		`tag:example.com,2025:cc-platform#1.0.0`,
 		*query,
@@ -129,7 +117,6 @@ func TestCoserv_FromBase64Url_ok_class(t *testing.T) {
 	require.NoError(t, err)
 	assert.Equal(t, `tag:example.com,2025:cc-platform#1.0.0`, actualProfile)
 	assert.Equal(t, "reference-values", actual.Query.ArtifactType.String())
-	assert.Equal(t, testTimestamp, actual.Query.Timestamp)
 	assert.Equal(t, "collected-artifacts", actual.Query.ResultType.String())
 	assert.Equal(t, *exampleClassSelector(t), actual.Query.EnvironmentSelector)
 }
@@ -146,7 +133,6 @@ func TestCoserv_FromBase64Url_ok_instance(t *testing.T) {
 	require.NoError(t, err)
 	assert.Equal(t, `tag:example.com,2025:cc-platform#1.0.0`, actualProfile)
 	assert.Equal(t, "reference-values", actual.Query.ArtifactType.String())
-	assert.Equal(t, testTimestamp, actual.Query.Timestamp)
 	assert.Equal(t, "both", actual.Query.ResultType.String())
 	assert.Equal(t, *exampleInstanceSelector(t), actual.Query.EnvironmentSelector)
 }
@@ -163,7 +149,6 @@ func TestCoserv_FromBase64Url_ok_group(t *testing.T) {
 	require.NoError(t, err)
 	assert.Equal(t, `tag:example.com,2025:cc-platform#1.0.0`, actualProfile)
 	assert.Equal(t, "reference-values", actual.Query.ArtifactType.String())
-	assert.Equal(t, testTimestamp, actual.Query.Timestamp)
 	assert.Equal(t, "source-artifacts", actual.Query.ResultType.String())
 	assert.Equal(t, *exampleGroupSelector(t), actual.Query.EnvironmentSelector)
 }
@@ -181,9 +166,6 @@ func TestCoserv_ToBase64Url_ok_instance(t *testing.T) {
 	query, err := NewQuery(ArtifactTypeReferenceValues, *exampleInstanceSelector(t), ResultTypeBoth)
 	require.NoError(t, err)
 
-	// overwrite the default query timestamp
-	query.SetTimestamp(testTimestamp)
-
 	tv, err := NewCoserv(
 		`tag:example.com,2025:cc-platform#1.0.0`,
 		*query,
@@ -204,9 +186,6 @@ func TestCoserv_ToBase64Url_ok_class(t *testing.T) {
 	query, err := NewQuery(ArtifactTypeReferenceValues, *exampleClassSelector(t), ResultTypeCollectedArtifacts)
 	require.NoError(t, err)
 
-	// overwrite the default query timestamp
-	query.SetTimestamp(testTimestamp)
-
 	tv, err := NewCoserv(
 		`tag:example.com,2025:cc-platform#1.0.0`,
 		*query,
@@ -227,9 +206,6 @@ func TestCoserv_ToBase64Url_ok_group(t *testing.T) {
 	query, err := NewQuery(ArtifactTypeReferenceValues, *exampleGroupSelector(t), ResultTypeSourceArtifacts)
 	require.NoError(t, err)
 
-	// overwrite the default query timestamp
-	query.SetTimestamp(testTimestamp)
-
 	tv, err := NewCoserv(
 		`tag:example.com,2025:cc-platform#1.0.0`,
 		*query,
@@ -250,9 +226,6 @@ func TestCoserv_ToEDN_ok(t *testing.T) {
 	query, err := NewQuery(ArtifactTypeReferenceValues, *exampleClassSelector(t), ResultTypeCollectedArtifacts)
 	require.NoError(t, err)
 
-	// overwrite the default query timestamp
-	query.SetTimestamp(testTimestamp)
-
 	tv, err := NewCoserv(
 		`tag:example.com,2025:cc-platform#1.0.0`,
 		*query,
@@ -292,7 +265,6 @@ func TestCoserv_FromCBOR_Results(t *testing.T) {
 	require.NoError(t, err)
 	assert.Equal(t, `tag:example.com,2025:cc-platform#1.0.0`, actualProfile)
 	assert.Equal(t, "reference-values", actual.Query.ArtifactType.String())
-	assert.Equal(t, testTimestamp, actual.Query.Timestamp)
 	assert.Equal(t, *exampleClassSelector2(t), actual.Query.EnvironmentSelector)
 
 	// results-related assertions
@@ -376,9 +348,6 @@ func TestCoserv_results_ToCBOR_ok(t *testing.T) {
 	query, err := NewQuery(ArtifactTypeReferenceValues, *envSelector, ResultTypeCollectedArtifacts)
 	require.NoError(t, err)
 
-	// overwrite the default query timestamp
-	query.SetTimestamp(testTimestamp)
-
 	tv, err := NewCoserv(
 		`tag:example.com,2025:cc-platform#1.0.0`,
 		*query,
diff --git a/coserv/environmentselector_test.go b/coserv/environmentselector_test.go
index 3d8a140b..b283c40d 100644
--- a/coserv/environmentselector_test.go
+++ b/coserv/environmentselector_test.go
@@ -17,6 +17,13 @@ func TestEnvironmentSelector_Valid_mixed_fail(t *testing.T) {
 	assert.EqualError(t, err, "only one selector type is allowed")
 }
 
+func TestEnvironmentSelector_Valid_mixed_fail_alt(t *testing.T) {
+	tv := badExampleMixedSelectorAlt(t)
+
+	err := tv.Valid()
+	assert.EqualError(t, err, "only one selector type is allowed")
+}
+
 func TestEnvironmentSelector_Valid_empty_fail(t *testing.T) {
 	tv := badExampleEmptySelector(t)
 
diff --git a/coserv/query.go b/coserv/query.go
index 42e46468..d84e5f12 100644
--- a/coserv/query.go
+++ b/coserv/query.go
@@ -5,19 +5,16 @@ package coserv
 
 import (
 	"fmt"
-	"time"
 )
 
 // Query is the internal representation of a Query data item
 type Query struct {
 	ArtifactType        ArtifactType        `cbor:"0,keyasint"`
 	EnvironmentSelector EnvironmentSelector `cbor:"1,keyasint"`
-	Timestamp           time.Time           `cbor:"2,keyasint"`
-	ResultType          ResultType          `cbor:"3,keyasint"`
+	ResultType          ResultType          `cbor:"2,keyasint"`
 }
 
-// NewQuery creates a new Query instance with the timestamp set to instantiation time.
-// (If needed, the timestamp can be changed using SetTimestamp.)
+// NewQuery creates a new Query instance.
 // An error is returned if the supplied environment selector is invalid.
 func NewQuery(
 	artifactType ArtifactType,
@@ -31,17 +28,10 @@ func NewQuery(
 	return &Query{
 		ArtifactType:        artifactType,
 		EnvironmentSelector: envSelector,
-		Timestamp:           time.Now(),
 		ResultType:          resultType,
 	}, nil
 }
 
-// SetTimestamp allows setting an explicit timestamp for the target Query object
-func (o *Query) SetTimestamp(ts time.Time) *Query {
-	o.Timestamp = ts
-	return o
-}
-
 // Valid ensures that the Query target is correctly populated
 func (o Query) Valid() error {
 	// TODO(tho) add tests for these two:
@@ -52,10 +42,5 @@ func (o Query) Valid() error {
 		return fmt.Errorf("invalid environment selector: %w", err)
 	}
 
-	zeroTime := time.Time{}
-	if o.Timestamp.Equal(zeroTime) {
-		return fmt.Errorf("timestamp not set")
-	}
-
 	return nil
 }
diff --git a/coserv/query_test.go b/coserv/query_test.go
index 4ef9e5b9..56b11981 100644
--- a/coserv/query_test.go
+++ b/coserv/query_test.go
@@ -5,10 +5,8 @@ package coserv
 
 import (
 	"testing"
-	"time"
 
 	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
 )
 
 func TestQuery_Valid_empty_query(t *testing.T) {
@@ -21,14 +19,8 @@ func TestQuery_Valid_empty_query(t *testing.T) {
 	assert.EqualError(t, actual, expected)
 }
 
-func TestQuery_Valid_invalid_timestamp(t *testing.T) {
-	tv := exampleClassQuery(t)
-
-	require.NotNil(t, tv.SetTimestamp(time.Time{}))
-
-	actual := tv.Valid()
-
-	expected := "timestamp not set"
-
-	assert.EqualError(t, actual, expected)
+func TestQuery_NewQuery_invalid_selector(t *testing.T) {
+	actual, err := NewQuery(ArtifactTypeEndorsedValues, *NewEnvironmentSelector(), ResultTypeBoth)
+	assert.Nil(t, actual)
+	assert.EqualError(t, err, "invalid environment selector: non-empty<> constraint violation")
 }
diff --git a/coserv/test_common.go b/coserv/test_common.go
index 44b9783e..b4366400 100644
--- a/coserv/test_common.go
+++ b/coserv/test_common.go
@@ -23,11 +23,10 @@ import (
 )
 
 var (
-	testExpiry, _    = time.Parse("2006-01-02T15:04:05Z", "2030-12-13T18:30:02Z")
-	testTimestamp, _ = time.Parse("2006-01-02T15:04:05Z", "2030-12-01T18:30:01Z")
-	testAuthority    = []byte{0xab, 0xcd, 0xef}
-	testBytes        = []byte{0x00, 0x11, 0x22, 0x33}
-	testES256Key     = []byte(`{
+	testExpiry, _ = time.Parse("2006-01-02T15:04:05Z", "2030-12-13T18:30:02Z")
+	testAuthority = []byte{0xab, 0xcd, 0xef}
+	testBytes     = []byte{0x00, 0x11, 0x22, 0x33}
+	testES256Key  = []byte(`{
     "kty": "EC",
     "crv": "P-256",
     "x": "MKBCTNIcKUSDii11ySs3526iDZ8AiTo7Tu6KPAqv7D4",
@@ -115,13 +114,24 @@ func badExampleMixedSelector(t *testing.T) *EnvironmentSelector {
 	instance0, err := comid.NewUEIDInstance(comid.TestUEID)
 	require.NoError(t, err)
 
+	selector := NewEnvironmentSelector().
+		AddGroup(StatefulGroup{Group: group0}).
+		AddInstance(StatefulInstance{Instance: instance0})
+	require.NotNil(t, selector)
+
+	return selector
+}
+
+func badExampleMixedSelectorAlt(t *testing.T) *EnvironmentSelector {
+	instance0, err := comid.NewUEIDInstance(comid.TestUEID)
+	require.NoError(t, err)
+
 	class0 := comid.NewClassUUID(comid.TestUUID)
 	require.NotNil(t, class0)
 
 	selector := NewEnvironmentSelector().
-		AddGroup(StatefulGroup{Group: group0}).
 		AddInstance(StatefulInstance{Instance: instance0}).
-		AddGroup(StatefulGroup{Group: group0})
+		AddClass(StatefulClass{Class: class0})
 	require.NotNil(t, selector)
 
 	return selector
@@ -133,12 +143,6 @@ func badExampleEmptySelector(t *testing.T) *EnvironmentSelector {
 	return es
 }
 
-func exampleClassQuery(t *testing.T) *Query {
-	qry, err := NewQuery(ArtifactTypeReferenceValues, *exampleClassSelector(t), ResultTypeCollectedArtifacts)
-	require.NoError(t, err)
-	return qry
-}
-
 func exampleReferenceValuesResultSet(t *testing.T) *ResultSet {
 	env := comid.Environment{
 		Class: comid.NewClassBytes(comid.TestBytes),
diff --git a/coserv/testvectors/example-class-selector-noindent.b64u b/coserv/testvectors/example-class-selector-noindent.b64u
index 6818918a..d45e969a 100644
--- a/coserv/testvectors/example-class-selector-noindent.b64u
+++ b/coserv/testvectors/example-class-selector-noindent.b64u
@@ -1 +1 @@
-ogB4JnRhZzpleGFtcGxlLmNvbSwyMDI1OmNjLXBsYXRmb3JtIzEuMC4wAaQAAgGhAIKBowDZAjBEABEiMwFuRXhhbXBsZSBWZW5kb3ICbUV4YW1wbGUgTW9kZWyBoQDYJVAx-1q_Aj5JkqpOlfnBUDv6AsB0MjAzMC0xMi0wMVQxODozMDowMVoDAA
\ No newline at end of file
+ogB4JnRhZzpleGFtcGxlLmNvbSwyMDI1OmNjLXBsYXRmb3JtIzEuMC4wAaMAAgGhAIKBowDZAjBEABEiMwFuRXhhbXBsZSBWZW5kb3ICbUV4YW1wbGUgTW9kZWyBoQDYJVAx-1q_Aj5JkqpOlfnBUDv6AgA
\ No newline at end of file
diff --git a/coserv/testvectors/example-class-selector-noindent.cbor b/coserv/testvectors/example-class-selector-noindent.cbor
index d6001768..44dff32b 100644
Binary files a/coserv/testvectors/example-class-selector-noindent.cbor and b/coserv/testvectors/example-class-selector-noindent.cbor differ
diff --git a/coserv/testvectors/example-class-selector-noindent.diag b/coserv/testvectors/example-class-selector-noindent.diag
index e6e964f4..91fe2a55 100644
--- a/coserv/testvectors/example-class-selector-noindent.diag
+++ b/coserv/testvectors/example-class-selector-noindent.diag
@@ -1 +1 @@
-{0: "tag:example.com,2025:cc-platform#1.0.0", 1: {0: 2, 1: {0: [[{0: 560(h'00112233'), 1: "Example Vendor", 2: "Example Model"}], [{0: 37(h'31fb5abf023e4992aa4e95f9c1503bfa')}]]}, 2: 0("2030-12-01T18:30:01Z"), 3: 0}}
\ No newline at end of file
+{0: "tag:example.com,2025:cc-platform#1.0.0", 1: {0: 2, 1: {0: [[{0: 560(h'00112233'), 1: "Example Vendor", 2: "Example Model"}], [{0: 37(h'31fb5abf023e4992aa4e95f9c1503bfa')}]]}, 2: 0}}
\ No newline at end of file
diff --git a/coserv/testvectors/example-class-selector-noindent.hex b/coserv/testvectors/example-class-selector-noindent.hex
index 85d0e4b2..6d9a66db 100644
--- a/coserv/testvectors/example-class-selector-noindent.hex
+++ b/coserv/testvectors/example-class-selector-noindent.hex
@@ -1 +1 @@
-a20078267461673a6578616d706c652e636f6d2c323032353a63632d706c6174666f726d23312e302e3001a4000201a1008281a300d902304400112233016e4578616d706c652056656e646f72026d4578616d706c65204d6f64656c81a100d8255031fb5abf023e4992aa4e95f9c1503bfa02c074323033302d31322d30315431383a33303a30315a0300
+a20078267461673a6578616d706c652e636f6d2c323032353a63632d706c6174666f726d23312e302e3001a3000201a1008281a300d902304400112233016e4578616d706c652056656e646f72026d4578616d706c65204d6f64656c81a100d8255031fb5abf023e4992aa4e95f9c1503bfa0200
diff --git a/coserv/testvectors/example-class-selector.b64u b/coserv/testvectors/example-class-selector.b64u
index 6818918a..d45e969a 100644
--- a/coserv/testvectors/example-class-selector.b64u
+++ b/coserv/testvectors/example-class-selector.b64u
@@ -1 +1 @@
-ogB4JnRhZzpleGFtcGxlLmNvbSwyMDI1OmNjLXBsYXRmb3JtIzEuMC4wAaQAAgGhAIKBowDZAjBEABEiMwFuRXhhbXBsZSBWZW5kb3ICbUV4YW1wbGUgTW9kZWyBoQDYJVAx-1q_Aj5JkqpOlfnBUDv6AsB0MjAzMC0xMi0wMVQxODozMDowMVoDAA
\ No newline at end of file
+ogB4JnRhZzpleGFtcGxlLmNvbSwyMDI1OmNjLXBsYXRmb3JtIzEuMC4wAaMAAgGhAIKBowDZAjBEABEiMwFuRXhhbXBsZSBWZW5kb3ICbUV4YW1wbGUgTW9kZWyBoQDYJVAx-1q_Aj5JkqpOlfnBUDv6AgA
\ No newline at end of file
diff --git a/coserv/testvectors/example-class-selector.cbor b/coserv/testvectors/example-class-selector.cbor
index d6001768..44dff32b 100644
Binary files a/coserv/testvectors/example-class-selector.cbor and b/coserv/testvectors/example-class-selector.cbor differ
diff --git a/coserv/testvectors/example-class-selector.diag b/coserv/testvectors/example-class-selector.diag
index 9d2ce120..be2d4149 100644
--- a/coserv/testvectors/example-class-selector.diag
+++ b/coserv/testvectors/example-class-selector.diag
@@ -14,7 +14,6 @@
         } ]
       ]
     },
-    2: 0("2030-12-01T18:30:01Z"),
-    3: 0
+    2: 0
   }
 }
diff --git a/coserv/testvectors/example-class-selector.hex b/coserv/testvectors/example-class-selector.hex
index 85d0e4b2..6d9a66db 100644
--- a/coserv/testvectors/example-class-selector.hex
+++ b/coserv/testvectors/example-class-selector.hex
@@ -1 +1 @@
-a20078267461673a6578616d706c652e636f6d2c323032353a63632d706c6174666f726d23312e302e3001a4000201a1008281a300d902304400112233016e4578616d706c652056656e646f72026d4578616d706c65204d6f64656c81a100d8255031fb5abf023e4992aa4e95f9c1503bfa02c074323033302d31322d30315431383a33303a30315a0300
+a20078267461673a6578616d706c652e636f6d2c323032353a63632d706c6174666f726d23312e302e3001a3000201a1008281a300d902304400112233016e4578616d706c652056656e646f72026d4578616d706c65204d6f64656c81a100d8255031fb5abf023e4992aa4e95f9c1503bfa0200
diff --git a/coserv/testvectors/example-group-selector.b64u b/coserv/testvectors/example-group-selector.b64u
index 77c243a4..b3f06bae 100644
--- a/coserv/testvectors/example-group-selector.b64u
+++ b/coserv/testvectors/example-group-selector.b64u
@@ -1 +1 @@
-ogB4JnRhZzpleGFtcGxlLmNvbSwyMDI1OmNjLXBsYXRmb3JtIzEuMC4wAaQAAgGhAoKB2QIwRYmZeGVWgdglUDH7Wr8CPkmSqk6V-cFQO_oCwHQyMDMwLTEyLTAxVDE4OjMwOjAxWgMB
\ No newline at end of file
+ogB4JnRhZzpleGFtcGxlLmNvbSwyMDI1OmNjLXBsYXRmb3JtIzEuMC4wAaMAAgGhAoKB2QIwRYmZeGVWgdglUDH7Wr8CPkmSqk6V-cFQO_oCAQ
\ No newline at end of file
diff --git a/coserv/testvectors/example-group-selector.cbor b/coserv/testvectors/example-group-selector.cbor
index f33511f1..bd743040 100644
Binary files a/coserv/testvectors/example-group-selector.cbor and b/coserv/testvectors/example-group-selector.cbor differ
diff --git a/coserv/testvectors/example-group-selector.diag b/coserv/testvectors/example-group-selector.diag
index 11bfee5e..9058f381 100644
--- a/coserv/testvectors/example-group-selector.diag
+++ b/coserv/testvectors/example-group-selector.diag
@@ -8,7 +8,6 @@
         [ 37(h'31FB5ABF023E4992AA4E95F9C1503BFA') ]
       ]
     },
-    2: 0("2030-12-01T18:30:01Z"),
-    3: 1
+    2: 1
   }
 }
diff --git a/coserv/testvectors/example-group-selector.hex b/coserv/testvectors/example-group-selector.hex
index f4588f89..5eb9ada4 100644
--- a/coserv/testvectors/example-group-selector.hex
+++ b/coserv/testvectors/example-group-selector.hex
@@ -1 +1 @@
-a20078267461673a6578616d706c652e636f6d2c323032353a63632d706c6174666f726d23312e302e3001a4000201a1028281d9023045899978655681d8255031fb5abf023e4992aa4e95f9c1503bfa02c074323033302d31322d30315431383a33303a30315a0301
+a20078267461673a6578616d706c652e636f6d2c323032353a63632d706c6174666f726d23312e302e3001a3000201a1028281d9023045899978655681d8255031fb5abf023e4992aa4e95f9c1503bfa0201
diff --git a/coserv/testvectors/example-instance-selector.b64u b/coserv/testvectors/example-instance-selector.b64u
index f876b1cb..ceff9f0e 100644
--- a/coserv/testvectors/example-instance-selector.b64u
+++ b/coserv/testvectors/example-instance-selector.b64u
@@ -1 +1 @@
-ogB4JnRhZzpleGFtcGxlLmNvbSwyMDI1OmNjLXBsYXRmb3JtIzEuMC4wAaQAAgGhAYKB2QImRwLerb7v3q2B2QIwRYmZeGVWAsB0MjAzMC0xMi0wMVQxODozMDowMVoDAg
\ No newline at end of file
+ogB4JnRhZzpleGFtcGxlLmNvbSwyMDI1OmNjLXBsYXRmb3JtIzEuMC4wAaMAAgGhAYKB2QImRwLerb7v3q2B2QIwRYmZeGVWAgI
\ No newline at end of file
diff --git a/coserv/testvectors/example-instance-selector.cbor b/coserv/testvectors/example-instance-selector.cbor
index 7f348326..b2208a39 100644
Binary files a/coserv/testvectors/example-instance-selector.cbor and b/coserv/testvectors/example-instance-selector.cbor differ
diff --git a/coserv/testvectors/example-instance-selector.diag b/coserv/testvectors/example-instance-selector.diag
index 8f666a9c..cf942f7b 100644
--- a/coserv/testvectors/example-instance-selector.diag
+++ b/coserv/testvectors/example-instance-selector.diag
@@ -8,7 +8,6 @@
         [ 560(h'8999786556') ]
       ]
     },
-    2: 0("2030-12-01T18:30:01Z"),
-    3: 2
+    2: 2
   }
 }
diff --git a/coserv/testvectors/example-instance-selector.hex b/coserv/testvectors/example-instance-selector.hex
index 32df8a29..f51c0239 100644
--- a/coserv/testvectors/example-instance-selector.hex
+++ b/coserv/testvectors/example-instance-selector.hex
@@ -1 +1 @@
-a20078267461673a6578616d706c652e636f6d2c323032353a63632d706c6174666f726d23312e302e3001a4000201a1018281d902264702deadbeefdead81d9023045899978655602c074323033302d31322d30315431383a33303a30315a0302
+a20078267461673a6578616d706c652e636f6d2c323032353a63632d706c6174666f726d23312e302e3001a3000201a1018281d902264702deadbeefdead81d902304589997865560202
diff --git a/coserv/testvectors/rv-class-simple-results-source-artifacts.b64u b/coserv/testvectors/rv-class-simple-results-source-artifacts.b64u
index ebfc463c..16e254cd 100644
--- a/coserv/testvectors/rv-class-simple-results-source-artifacts.b64u
+++ b/coserv/testvectors/rv-class-simple-results-source-artifacts.b64u
@@ -1 +1 @@
-owB4JnRhZzpleGFtcGxlLmNvbSwyMDI1OmNjLXBsYXRmb3JtIzEuMC4wAaQAAgGhAIGBowDZAjBEABEiMwFuRXhhbXBsZSBWZW5kb3ICbUV4YW1wbGUgTW9kZWwCwHQyMDMwLTEyLTAxVDE4OjMwOjAxWgMBAqMAgArAdDIwMzAtMTItMTNUMTg6MzA6MDJaC4KCeB9hcHBsaWNhdGlvbi92bmQuZXhhbXBsZS5yZWZ2YWxzRK-urayCeB9hcHBsaWNhdGlvbi92bmQuZXhhbXBsZS5yZWZ2YWxzRK2sq6o
\ No newline at end of file
+owB4JnRhZzpleGFtcGxlLmNvbSwyMDI1OmNjLXBsYXRmb3JtIzEuMC4wAaMAAgGhAIGBowDZAjBEABEiMwFuRXhhbXBsZSBWZW5kb3ICbUV4YW1wbGUgTW9kZWwCAQKjAIAKwHQyMDMwLTEyLTEzVDE4OjMwOjAyWguCgngfYXBwbGljYXRpb24vdm5kLmV4YW1wbGUucmVmdmFsc0Svrq2sgngfYXBwbGljYXRpb24vdm5kLmV4YW1wbGUucmVmdmFsc0StrKuq
\ No newline at end of file
diff --git a/coserv/testvectors/rv-class-simple-results-source-artifacts.cbor b/coserv/testvectors/rv-class-simple-results-source-artifacts.cbor
index fd01a9f9..9282106c 100644
Binary files a/coserv/testvectors/rv-class-simple-results-source-artifacts.cbor and b/coserv/testvectors/rv-class-simple-results-source-artifacts.cbor differ
diff --git a/coserv/testvectors/rv-class-simple-results-source-artifacts.diag b/coserv/testvectors/rv-class-simple-results-source-artifacts.diag
index c3129480..ba3fdb02 100644
--- a/coserv/testvectors/rv-class-simple-results-source-artifacts.diag
+++ b/coserv/testvectors/rv-class-simple-results-source-artifacts.diag
@@ -11,8 +11,7 @@
         }
       ] ]
     },
-    / timestamp /   2: 0("2030-12-01T18:30:01Z"),
-    / result-type / 3: 1 / source-artifacts /
+    / result-type / 2: 1 / source-artifacts /
   },
   / results / 2: {
     / rvq / 0: [ ],
diff --git a/coserv/testvectors/rv-class-simple-results-source-artifacts.hex b/coserv/testvectors/rv-class-simple-results-source-artifacts.hex
index df3d8d80..397edeb4 100644
--- a/coserv/testvectors/rv-class-simple-results-source-artifacts.hex
+++ b/coserv/testvectors/rv-class-simple-results-source-artifacts.hex
@@ -1 +1 @@
-a30078267461673a6578616d706c652e636f6d2c323032353a63632d706c6174666f726d23312e302e3001a4000201a1008181a300d902304400112233016e4578616d706c652056656e646f72026d4578616d706c65204d6f64656c02c074323033302d31322d30315431383a33303a30315a030102a300800ac074323033302d31322d31335431383a33303a30325a0b8282781f6170706c69636174696f6e2f766e642e6578616d706c652e72656676616c7344afaeadac82781f6170706c69636174696f6e2f766e642e6578616d706c652e72656676616c7344adacabaa
+a30078267461673a6578616d706c652e636f6d2c323032353a63632d706c6174666f726d23312e302e3001a3000201a1008181a300d902304400112233016e4578616d706c652056656e646f72026d4578616d706c65204d6f64656c020102a300800ac074323033302d31322d31335431383a33303a30325a0b8282781f6170706c69636174696f6e2f766e642e6578616d706c652e72656676616c7344afaeadac82781f6170706c69636174696f6e2f766e642e6578616d706c652e72656676616c7344adacabaa
diff --git a/coserv/testvectors/rv-class-simple-results.b64u b/coserv/testvectors/rv-class-simple-results.b64u
index 407fec27..52912dd2 100644
--- a/coserv/testvectors/rv-class-simple-results.b64u
+++ b/coserv/testvectors/rv-class-simple-results.b64u
@@ -1 +1 @@
-owB4JnRhZzpleGFtcGxlLmNvbSwyMDI1OmNjLXBsYXRmb3JtIzEuMC4wAaQAAgGhAIGBowDZAjBEABEiMwFuRXhhbXBsZSBWZW5kb3ICbUV4YW1wbGUgTW9kZWwCwHQyMDMwLTEyLTAxVDE4OjMwOjAxWgMAAqIAgaIBgdkCMEOrze8CgqEAowDZAjBEABEiMwFuRXhhbXBsZSBWZW5kb3ICbUV4YW1wbGUgTW9kZWyCoQGiC2tDb21wb25lbnQgQQKCggFBqoICQbuhAaILa0NvbXBvbmVudCBCAoKCAUHMggJB3QrAdDIwMzAtMTItMTNUMTg6MzA6MDJa
\ No newline at end of file
+owB4JnRhZzpleGFtcGxlLmNvbSwyMDI1OmNjLXBsYXRmb3JtIzEuMC4wAaMAAgGhAIGBowDZAjBEABEiMwFuRXhhbXBsZSBWZW5kb3ICbUV4YW1wbGUgTW9kZWwCAAKiAIGiAYHZAjBDq83vAoKhAKMA2QIwRAARIjMBbkV4YW1wbGUgVmVuZG9yAm1FeGFtcGxlIE1vZGVsgqEBogtrQ29tcG9uZW50IEECgoIBQaqCAkG7oQGiC2tDb21wb25lbnQgQgKCggFBzIICQd0KwHQyMDMwLTEyLTEzVDE4OjMwOjAyWg
\ No newline at end of file
diff --git a/coserv/testvectors/rv-class-simple-results.cbor b/coserv/testvectors/rv-class-simple-results.cbor
index b15fb6e8..9185c8d2 100644
Binary files a/coserv/testvectors/rv-class-simple-results.cbor and b/coserv/testvectors/rv-class-simple-results.cbor differ
diff --git a/coserv/testvectors/rv-class-simple-results.diag b/coserv/testvectors/rv-class-simple-results.diag
index a5446b7a..9a9abc8a 100644
--- a/coserv/testvectors/rv-class-simple-results.diag
+++ b/coserv/testvectors/rv-class-simple-results.diag
@@ -11,8 +11,7 @@
         }
       ] ]
     },
-    / timestamp /   2: 0("2030-12-01T18:30:01Z"),
-    / result-type / 3: 0 / collected-material /
+    / result-type / 2: 0 / collected-material /
   },
   / results / 2: {
     / rvq / 0: [
diff --git a/coserv/testvectors/rv-class-simple-results.hex b/coserv/testvectors/rv-class-simple-results.hex
index 4b5d82b3..5d5adefb 100644
--- a/coserv/testvectors/rv-class-simple-results.hex
+++ b/coserv/testvectors/rv-class-simple-results.hex
@@ -1 +1 @@
-a30078267461673a6578616d706c652e636f6d2c323032353a63632d706c6174666f726d23312e302e3001a4000201a1008181a300d902304400112233016e4578616d706c652056656e646f72026d4578616d706c65204d6f64656c02c074323033302d31322d30315431383a33303a30315a030002a20081a20181d9023043abcdef0282a100a300d902304400112233016e4578616d706c652056656e646f72026d4578616d706c65204d6f64656c82a101a20b6b436f6d706f6e656e7420410282820141aa820241bba101a20b6b436f6d706f6e656e7420420282820141cc820241dd0ac074323033302d31322d31335431383a33303a30325a
+a30078267461673a6578616d706c652e636f6d2c323032353a63632d706c6174666f726d23312e302e3001a3000201a1008181a300d902304400112233016e4578616d706c652056656e646f72026d4578616d706c65204d6f64656c020002a20081a20181d9023043abcdef0282a100a300d902304400112233016e4578616d706c652056656e646f72026d4578616d706c65204d6f64656c82a101a20b6b436f6d706f6e656e7420410282820141aa820241bba101a20b6b436f6d706f6e656e7420420282820141cc820241dd0ac074323033302d31322d31335431383a33303a30325a
diff --git a/coserv/testvectors/rv-class-simple.b64u b/coserv/testvectors/rv-class-simple.b64u
index 009dfb5b..1a4039c5 100644
--- a/coserv/testvectors/rv-class-simple.b64u
+++ b/coserv/testvectors/rv-class-simple.b64u
@@ -1 +1 @@
-ogB4JnRhZzpleGFtcGxlLmNvbSwyMDI1OmNjLXBsYXRmb3JtIzEuMC4wAaQAAgGhAIGBowDZAjBEABEiMwFuRXhhbXBsZSBWZW5kb3ICbUV4YW1wbGUgTW9kZWwCwHQyMDMwLTEyLTAxVDE4OjMwOjAxWgMB
\ No newline at end of file
+ogB4JnRhZzpleGFtcGxlLmNvbSwyMDI1OmNjLXBsYXRmb3JtIzEuMC4wAaMAAgGhAIGBowDZAjBEABEiMwFuRXhhbXBsZSBWZW5kb3ICbUV4YW1wbGUgTW9kZWwCAQ
\ No newline at end of file
diff --git a/coserv/testvectors/rv-class-simple.cbor b/coserv/testvectors/rv-class-simple.cbor
index c076c62e..653f91f4 100644
Binary files a/coserv/testvectors/rv-class-simple.cbor and b/coserv/testvectors/rv-class-simple.cbor differ
diff --git a/coserv/testvectors/rv-class-simple.diag b/coserv/testvectors/rv-class-simple.diag
index 35e8b4fb..c8b8a278 100644
--- a/coserv/testvectors/rv-class-simple.diag
+++ b/coserv/testvectors/rv-class-simple.diag
@@ -11,7 +11,6 @@
         }
       ] ]
     },
-    / timestamp /   2: 0("2030-12-01T18:30:01Z"),
-    / result-type / 3: 1 / source-material /
+    / result-type / 2: 1 / source-material /
   }
 }
diff --git a/coserv/testvectors/rv-class-simple.hex b/coserv/testvectors/rv-class-simple.hex
index 080c493e..8b9531e4 100644
--- a/coserv/testvectors/rv-class-simple.hex
+++ b/coserv/testvectors/rv-class-simple.hex
@@ -1 +1 @@
-a20078267461673a6578616d706c652e636f6d2c323032353a63632d706c6174666f726d23312e302e3001a4000201a1008181a300d902304400112233016e4578616d706c652056656e646f72026d4578616d706c65204d6f64656c02c074323033302d31322d30315431383a33303a30315a0301
+a20078267461673a6578616d706c652e636f6d2c323032353a63632d706c6174666f726d23312e302e3001a3000201a1008181a300d902304400112233016e4578616d706c652056656e646f72026d4578616d706c65204d6f64656c0201
diff --git a/coserv/testvectors/rv-class-stateful.b64u b/coserv/testvectors/rv-class-stateful.b64u
index 6b08e848..6fba8494 100644
--- a/coserv/testvectors/rv-class-stateful.b64u
+++ b/coserv/testvectors/rv-class-stateful.b64u
@@ -1 +1 @@
-ogB4JnRhZzpleGFtcGxlLmNvbSwyMDI1OmNjLXBsYXRmb3JtIzEuMC4wAaQAAgGhAIGCowDZAjBEABEiMwFuRXhhbXBsZSBWZW5kb3ICbUV4YW1wbGUgTW9kZWyBoQGiC2tDb21wb25lbnQgQQKBggFBqgLAdDIwMzAtMTItMDFUMTg6MzA6MDFaAwE
\ No newline at end of file
+ogB4JnRhZzpleGFtcGxlLmNvbSwyMDI1OmNjLXBsYXRmb3JtIzEuMC4wAaMAAgGhAIGCowDZAjBEABEiMwFuRXhhbXBsZSBWZW5kb3ICbUV4YW1wbGUgTW9kZWyBoQGiC2tDb21wb25lbnQgQQKBggFBqgIB
\ No newline at end of file
diff --git a/coserv/testvectors/rv-class-stateful.cbor b/coserv/testvectors/rv-class-stateful.cbor
index 6a24efd3..fcb69963 100644
Binary files a/coserv/testvectors/rv-class-stateful.cbor and b/coserv/testvectors/rv-class-stateful.cbor differ
diff --git a/coserv/testvectors/rv-class-stateful.diag b/coserv/testvectors/rv-class-stateful.diag
index 18a9d086..a9cae4b2 100644
--- a/coserv/testvectors/rv-class-stateful.diag
+++ b/coserv/testvectors/rv-class-stateful.diag
@@ -23,7 +23,6 @@
         ]
       ]
     },
-    / timestamp /   2: 0("2030-12-01T18:30:01Z"),
-    / result-type / 3: 1 / source-material /
+    / result-type / 2: 1 / source-material /
   }
 }
diff --git a/coserv/testvectors/rv-class-stateful.hex b/coserv/testvectors/rv-class-stateful.hex
index 7b03c7d9..ef1ac7c2 100644
--- a/coserv/testvectors/rv-class-stateful.hex
+++ b/coserv/testvectors/rv-class-stateful.hex
@@ -1 +1 @@
-a20078267461673a6578616d706c652e636f6d2c323032353a63632d706c6174666f726d23312e302e3001a4000201a1008182a300d902304400112233016e4578616d706c652056656e646f72026d4578616d706c65204d6f64656c81a101a20b6b436f6d706f6e656e7420410281820141aa02c074323033302d31322d30315431383a33303a30315a0301
+a20078267461673a6578616d706c652e636f6d2c323032353a63632d706c6174666f726d23312e302e3001a3000201a1008182a300d902304400112233016e4578616d706c652056656e646f72026d4578616d706c65204d6f64656c81a101a20b6b436f6d706f6e656e7420410281820141aa0201
diff --git a/coserv/testvectors/rv-results.b64u b/coserv/testvectors/rv-results.b64u
index 9668041f..fc1726d4 100644
--- a/coserv/testvectors/rv-results.b64u
+++ b/coserv/testvectors/rv-results.b64u
@@ -1 +1 @@
-owB4JnRhZzpleGFtcGxlLmNvbSwyMDI1OmNjLXBsYXRmb3JtIzEuMC4wAaQAAgGhAIGBoQDZAjBFiZl4ZVYCwHQyMDMwLTEyLTAxVDE4OjMwOjAxWgMAAqIAgaIBgdkCMEOrze8CgqEAoQDZAjBFiZl4ZVaBogDYJVAx-1q_Aj5JkqpOlfnBUDv6AaIAogBlMS4yLjMBGUAAAdkCKQIKwHQyMDMwLTEyLTEzVDE4OjMwOjAyWg
\ No newline at end of file
+owB4JnRhZzpleGFtcGxlLmNvbSwyMDI1OmNjLXBsYXRmb3JtIzEuMC4wAaMAAgGhAIGBoQDZAjBFiZl4ZVYCAAKiAIGiAYHZAjBDq83vAoKhAKEA2QIwRYmZeGVWgaIA2CVQMftavwI-SZKqTpX5wVA7-gGiAKIAZTEuMi4zARlAAAHZAikCCsB0MjAzMC0xMi0xM1QxODozMDowMlo
\ No newline at end of file
diff --git a/coserv/testvectors/rv-results.cbor b/coserv/testvectors/rv-results.cbor
index b1525c56..fbbb8a45 100644
Binary files a/coserv/testvectors/rv-results.cbor and b/coserv/testvectors/rv-results.cbor differ
diff --git a/coserv/testvectors/rv-results.diag b/coserv/testvectors/rv-results.diag
index 151b60ba..43489d71 100644
--- a/coserv/testvectors/rv-results.diag
+++ b/coserv/testvectors/rv-results.diag
@@ -9,8 +9,7 @@
         }
       ] ]
     },
-    2: 0("2030-12-01T18:30:01Z"),
-    3: 0
+    2: 0
   },
   / results / 2: {
     0: [
diff --git a/coserv/testvectors/rv-results.hex b/coserv/testvectors/rv-results.hex
index 19165b57..38cb7a48 100644
--- a/coserv/testvectors/rv-results.hex
+++ b/coserv/testvectors/rv-results.hex
@@ -1 +1 @@
-a30078267461673a6578616d706c652e636f6d2c323032353a63632d706c6174666f726d23312e302e3001a4000201a1008181a100d9023045899978655602c074323033302d31322d30315431383a33303a30315a030002a20081a20181d9023043abcdef0282a100a100d9023045899978655681a200d8255031fb5abf023e4992aa4e95f9c1503bfa01a200a20065312e322e330119400001d90229020ac074323033302d31322d31335431383a33303a30325a
+a30078267461673a6578616d706c652e636f6d2c323032353a63632d706c6174666f726d23312e302e3001a3000201a1008181a100d90230458999786556020002a20081a20181d9023043abcdef0282a100a100d9023045899978655681a200d8255031fb5abf023e4992aa4e95f9c1503bfa01a200a20065312e322e330119400001d90229020ac074323033302d31322d31335431383a33303a30325a