diff --git a/src/subrepos/gtrack-common-ngx/app/geosearch/services/test/geosearch.service.spec.ts b/src/subrepos/gtrack-common-ngx/app/geosearch/services/test/geosearch.service.spec.ts
index 9b9a4b84..db99a841 100644
--- a/src/subrepos/gtrack-common-ngx/app/geosearch/services/test/geosearch.service.spec.ts
+++ b/src/subrepos/gtrack-common-ngx/app/geosearch/services/test/geosearch.service.spec.ts
@@ -52,7 +52,7 @@ describe('GeoSearchService', () => {
 
       let result = await service.searchBox(query).toPromise();
 
-      expect(spy).toHaveBeenCalledWith('geo.query.includedInBox', {
+      expect(spy).toHaveBeenCalledWith('open.geo.query.includedInBox', {
         payload: query
       });
     });
@@ -70,7 +70,7 @@ describe('GeoSearchService', () => {
 
       let result = await service.searchCircle(query).toPromise();
 
-      expect(spy).toHaveBeenCalledWith('geo.query.includedInCircle', {
+      expect(spy).toHaveBeenCalledWith('open.geo.query.includedInCircle', {
         payload: query
       });
     });
diff --git a/src/subrepos/gtrack-common-ngx/app/hike/store/poi/test/actions.spec.ts b/src/subrepos/gtrack-common-ngx/app/hike/store/poi/test/actions.spec.ts
index 56f7a005..daf9d5c4 100644
--- a/src/subrepos/gtrack-common-ngx/app/hike/store/poi/test/actions.spec.ts
+++ b/src/subrepos/gtrack-common-ngx/app/hike/store/poi/test/actions.spec.ts
@@ -10,10 +10,11 @@ describe('Poi actions', () => {
   let poiData: IPoi;
   let poi: Poi;
 
-  beforeEach(() => {
-    id = uuid();
+  id = uuid(),
 
+  beforeEach(() => {
     poiData = {
+      id: id,
       lat: 42.25,
       lon: 19.32,
       elevation: 240,
@@ -28,7 +29,6 @@ describe('Poi actions', () => {
 
     poiDataStored = {
       ...poiData,
-      id,
       timestamp: new Date().getTime()
     };
 
diff --git a/src/subrepos/gtrack-common-ngx/app/hike/store/poi/test/effects.spec.ts b/src/subrepos/gtrack-common-ngx/app/hike/store/poi/test/effects.spec.ts
index 95918138..6fdaf274 100644
--- a/src/subrepos/gtrack-common-ngx/app/hike/store/poi/test/effects.spec.ts
+++ b/src/subrepos/gtrack-common-ngx/app/hike/store/poi/test/effects.spec.ts
@@ -124,7 +124,7 @@ describe('Poi effects', () => {
 
   describe('savePoi$', () => {
     it('should return the id of the created Poi from PoiCreated', () => {
-      const action = new poiActions.SavePoi(poiFixtures[0]);
+      const action = new poiActions.SavePoi(new Poi(poiFixtures[0]));
       const completion = new poiActions.PoiSaved(newId);
       const expected = cold('-b', {b: completion});
 
diff --git a/src/subrepos/gtrack-common-ngx/app/hike/store/poi/test/fixtures/pois.ts b/src/subrepos/gtrack-common-ngx/app/hike/store/poi/test/fixtures/pois.ts
index decd69f9..8f39d7df 100644
--- a/src/subrepos/gtrack-common-ngx/app/hike/store/poi/test/fixtures/pois.ts
+++ b/src/subrepos/gtrack-common-ngx/app/hike/store/poi/test/fixtures/pois.ts
@@ -3,6 +3,7 @@ import * as uuid from 'uuid/v4';
 
 export const pois: IPoi[] = [
   {
+    id: uuid(),
     lat: 42.25,
     lon: 19.32,
     elevation: 150,
@@ -15,6 +16,7 @@ export const pois: IPoi[] = [
     }
   },
   {
+    id: uuid(),
     lat: 44.55,
     lon: -19.44,
     elevation: 252.1,
@@ -31,12 +33,10 @@ export const pois: IPoi[] = [
 export const poisStored: IPoiStored[] = [
   {
     ...pois[0],
-    id: uuid(),
     timestamp: new Date().getTime()
   },
   {
     ...pois[1],
-    id: uuid(),
     timestamp: new Date().getTime()
   }
 ]