diff --git a/webapp/src/app/geosource/components/metadata-list/metadata-list.component.spec.ts b/webapp/src/app/geosource/components/metadata-list/metadata-list.component.spec.ts
index 31ad2ce6578fd1eb4f192ef265b7ed02601bcb85..c097e24177c27ac25f9627e6a57719f2e8d79175 100644
--- a/webapp/src/app/geosource/components/metadata-list/metadata-list.component.spec.ts
+++ b/webapp/src/app/geosource/components/metadata-list/metadata-list.component.spec.ts
@@ -109,7 +109,6 @@ describe('MetadataListComponent', () => {
       spyOnProperty(service, 'pageIndex', 'get').and.returnValue(5);
       spyOn(service, 'getDatasetList').and.returnValue(Observable.of(datasetList));
       spyOn(service, 'searchChange$').and.returnValue(searchSubject.asObservable());
-      spyOn(elasticsearchService, 'getSuggestion').and.returnValue(Observable.of(new SearchSuggestion()));
       spyOn(component, 'search').and.callThrough();
       spyOn(component, 'getSuggestion').and.callThrough();
     });
diff --git a/webapp/src/environments/environment.prod.ts b/webapp/src/environments/environment.prod.ts
index 82a49c28056eea7034937e12e45c3b88642d3a32..11d9b4d3447a63f005af58c4832a9bdddaf1b333 100644
--- a/webapp/src/environments/environment.prod.ts
+++ b/webapp/src/environments/environment.prod.ts
@@ -7,8 +7,8 @@ export const environment = {
   production: true,
 
   elasticsearchUrl: {
-    full: '/test/elasticsearch/*.full',
-    meta: '/test/elasticsearch/*.meta'
+    full: '/elasticsearch/*.full',
+    meta: '/elasticsearch/*.meta'
   },
 
   angularAppHost: {
diff --git a/webapp/src/environments/environment.ts b/webapp/src/environments/environment.ts
index 6eba502e5fa54650afa208ea5ca5e071d66831b4..45d82e1098bbd9e4a368d416ba00b326a28454d3 100644
--- a/webapp/src/environments/environment.ts
+++ b/webapp/src/environments/environment.ts
@@ -7,8 +7,8 @@ export const environment = {
   production: false,
 
   elasticsearchUrl: {
-    full: 'http://localhost:8081/test/elasticsearch/*.full',
-    meta: 'http://localhost:8081/test/elasticsearch/*.meta'
+    full: 'http://localhost:8081/elasticsearch/*.full',
+    meta: 'http://localhost:8081/elasticsearch/*.meta'
   },
 
   angularAppHost: {