diff --git a/aql/mockConvertQuery.go b/aql/mockConvertQuery.go
index de536b5ff5018dc8dc0cafd124d2e2e2be5f52a3..3c0ffbf8209f2c7624d44c6e7937ea9e214ab585 100644
--- a/aql/mockConvertQuery.go
+++ b/aql/mockConvertQuery.go
@@ -1,6 +1,10 @@
 package aql
 
-import "errors"
+import (
+	"errors"
+
+	"git.science.uu.nl/datastrophe/query-conversion/entity"
+)
 
 // A MockService implements the query convert usecase interface (mock)
 type MockService struct {
@@ -15,14 +19,13 @@ func NewMockService() *MockService {
 }
 
 // ConvertQuery returns a hard coded string message (mock)
-func (s *MockService) ConvertQuery(jsonMsg *[]byte) (*string, *string, error) {
+func (s *MockService) ConvertQuery(JSONQuery *entity.IncomingQueryJSON) (*string, error) {
 	mockQuery := "Query converted"
-	mockDatabaseName := "test-database"
 
 	if !s.throwError {
-		return &mockQuery, &mockDatabaseName, nil
+		return &mockQuery, nil
 	}
-	return nil, &mockDatabaseName, errors.New("Failed to convert query")
+	return nil, errors.New("Failed to convert query")
 }
 
 // ToggleError decides whether the convert function throws an error