diff --git a/test/unit/internal/contextfull/process_test.go b/test/unit/internal/contextfull/process_test.go
index c8c9eab6..027d2257 100644
--- a/test/unit/internal/contextfull/process_test.go
+++ b/test/unit/internal/contextfull/process_test.go
@@ -16,7 +16,7 @@ func TestContextFull(t *testing.T) {
 
 	extractor := contextfull.New()
 
-	query := query.Query{
+	query := query.QueryRow{
 		ID:              uuid.New(),
 		Type:            query.TypeJsonExtractor,
 		RequiredQueryID: uuid.Nil,
diff --git a/test/unit/internal/jsonextractor/process_test.go b/test/unit/internal/jsonextractor/process_test.go
index 9fea1a61..7033b6de 100644
--- a/test/unit/internal/jsonextractor/process_test.go
+++ b/test/unit/internal/jsonextractor/process_test.go
@@ -30,7 +30,7 @@ func TestJSONProcess(t *testing.T) {
 
 	extractor := jsonextractor.New(queries)
 
-	query := query.Query{
+	query := query.QueryRow{
 		ID:              uuid.New(),
 		Type:            query.TypeJsonExtractor,
 		RequiredQueryID: uuid.Nil,
@@ -99,7 +99,7 @@ func TestJSONProcessJSON(t *testing.T) {
 
 	extractor := jsonextractor.New(queries)
 
-	query := query.Query{
+	query := query.QueryRow{
 		ID:              uuid.New(),
 		Type:            query.TypeJsonExtractor,
 		RequiredQueryID: uuid.Nil,
@@ -185,7 +185,7 @@ func TestJSONProcessResults(t *testing.T) {
 
 	extractor := jsonextractor.New(queries)
 
-	query := query.Query{
+	query := query.QueryRow{
 		ID:              uuid.New(),
 		Type:            query.TypeJsonExtractor,
 		RequiredQueryID: uuid.Nil,
diff --git a/test/unit/internal/query/parse_test.go b/test/unit/internal/query/parse_test.go
index 0727afa4..542b6369 100644
--- a/test/unit/internal/query/parse_test.go
+++ b/test/unit/internal/query/parse_test.go
@@ -18,7 +18,7 @@ func TestParseDBQuery(t *testing.T) {
 		Type:            repository.NullQuerytype{Valid: true, Querytype: repository.QuerytypeJsonExtractor},
 		Queryversion:    pgtype.Int4{},
 	}
-	value, err := query.ParseDBQuery(&dbResult)
+	value, err := query.ParseDBQueryRow(&dbResult)
 	assert.Nil(t, err)
 	assert.Equal(t, uuid.Nil, value.ID)
 	assert.Equal(t, uuid.Nil, value.RequiredQueryID)
@@ -26,7 +26,7 @@ func TestParseDBQuery(t *testing.T) {
 	assert.Equal(t, query.Type(query.TypeJsonExtractor), value.Type)
 
 	dbResult.Type = repository.NullQuerytype{}
-	_, err = query.ParseDBQuery(&dbResult)
+	_, err = query.ParseDBQueryRow(&dbResult)
 	assert.EqualError(t, err, "invalid database query type")
 }
 
diff --git a/test/unit/internal/queryQueue/queue_test.go b/test/unit/internal/queryQueue/queue_test.go
index 709a2f8e..ba334555 100644
--- a/test/unit/internal/queryQueue/queue_test.go
+++ b/test/unit/internal/queryQueue/queue_test.go
@@ -56,7 +56,7 @@ func TestQueue(t *testing.T) {
 	querySixVersion := int32(6)
 	contextID := uuid.New()
 	contextVersion := int32(1)
-	collectorQueries := []query.Query{
+	collectorQueries := []query.QueryRow{
 		{ID: contextID, Type: query.TypeContextFull, RequiredQueryID: uuid.Nil, Version: contextVersion},
 		{ID: queryOneID, Type: query.TypeJsonExtractor, RequiredQueryID: contextID, Version: queryOneVersion},
 		{ID: queryTwoID, Type: query.TypeJsonExtractor, RequiredQueryID: queryOneID, Version: queryTwoVersion},
@@ -86,7 +86,7 @@ func TestQueue(t *testing.T) {
 		{ID: uuid.New(), QueryID: queryOneID, QueryVersion: queryOneVersion - 1},
 	}
 
-	expectedQueries := []query.Query{
+	expectedQueries := []query.QueryRow{
 		{ID: querySixID, Type: query.TypeJsonExtractor, RequiredQueryID: contextID, Version: querySixVersion},
 		{ID: queryFiveID, Type: query.TypeJsonExtractor, RequiredQueryID: querySixID, Version: queryFiveVersion},
 		{ID: queryOneID, Type: query.TypeJsonExtractor, RequiredQueryID: contextID, Version: queryOneVersion},