diff --git a/src/tests/gxs/data_service/rsdataservice_test.cc b/src/tests/gxs/data_service/rsdataservice_test.cc
index 90f800355..4cb126cce 100644
--- a/src/tests/gxs/data_service/rsdataservice_test.cc
+++ b/src/tests/gxs/data_service/rsdataservice_test.cc
@@ -335,38 +335,3 @@ void tearDown(){
 
 }
 
-
-
-bool operator ==(const RsGxsGrpMetaData& l, const RsGxsGrpMetaData& r)
-{
-    if(!(l.signSet == r.signSet)) return false;
-    if(!(l.keys == r.keys)) return false;
-    if(l.mGroupFlags != r.mGroupFlags) return false;
-    if(l.mPublishTs != r.mPublishTs) return false;
-    if(l.mAuthorId != r.mAuthorId) return false;
-    if(l.mGroupName != r.mGroupName) return false;
-    if(l.mGroupId != r.mGroupId) return false;
-    if(l.mGroupStatus != r.mGroupStatus) return false;
-    if(l.mPop != r.mPop) return false;
-    if(l.mMsgCount != r.mMsgCount) return false;
-    if(l.mSubscribeFlags != r.mSubscribeFlags) return false;
-
-    return true;
-}
-
-bool operator ==(const RsGxsMsgMetaData& l, const RsGxsMsgMetaData& r)
-{
-
-    if(!(l.signSet == r.signSet)) return false;
-    if(l.mGroupId != r.mGroupId) return false;
-    if(l.mAuthorId != r.mAuthorId) return false;
-    if(l.mParentId != r.mParentId) return false;
-    if(l.mOrigMsgId != r.mOrigMsgId) return false;
-    if(l.mThreadId != r.mThreadId) return false;
-    if(l.mMsgId != r.mMsgId) return false;
-    if(l.mMsgName != r.mMsgName) return false;
-    if(l.mPublishTs != r.mPublishTs) return false;
-    if(l.mMsgFlags != r.mMsgFlags) return false;
-
-    return true;
-}
diff --git a/tests/unittests/libretroshare/gxs/common/data_support.cc b/tests/unittests/libretroshare/gxs/common/data_support.cc
index d77fa2ea6..1b64e8e8c 100644
--- a/tests/unittests/libretroshare/gxs/common/data_support.cc
+++ b/tests/unittests/libretroshare/gxs/common/data_support.cc
@@ -98,7 +98,7 @@ void init_item(RsGxsGrpMetaData* metaGrp)
     randString(SHORT_STR, metaGrp->mGroupName);
     randString(SHORT_STR, metaGrp->mServiceString);
 
-    init_item(metaGrp->signSet);
+    init_item(metaGrp->signSet);// This is not stored in db.
     init_item(metaGrp->keys);
 
     metaGrp->mPublishTs = rand()%3452;
@@ -115,9 +115,10 @@ void init_item(RsGxsGrpMetaData* metaGrp)
     metaGrp->mGroupStatus = rand()%313;
     metaGrp->mRecvTS = rand()%313;
 
-	 metaGrp->mOriginator = RsPeerId::random() ;
-	 metaGrp->mInternalCircle = RsGxsCircleId::random() ;
-	 metaGrp->mHash = RsFileHash::random() ;
+    metaGrp->mOriginator = RsPeerId::random();
+    metaGrp->mInternalCircle = RsGxsCircleId::random();
+    metaGrp->mHash = RsFileHash::random();
+    metaGrp->mGrpSize = 0;// This was calculated on db read.
 }
 
 void init_item(RsGxsMsgMetaData* metaMsg)
diff --git a/tests/unittests/libretroshare/gxs/data_service/rsdataservice_test.cc b/tests/unittests/libretroshare/gxs/data_service/rsdataservice_test.cc
index 6cf0abeef..9720c1294 100644
--- a/tests/unittests/libretroshare/gxs/data_service/rsdataservice_test.cc
+++ b/tests/unittests/libretroshare/gxs/data_service/rsdataservice_test.cc
@@ -107,6 +107,11 @@ void test_groupStoreAndRetrieve(){
         RsGxsGrpMetaData *l_Meta = mit->second,
         *r_Meta = grpMetaR[grpId];
 
+        // assign signSet and mGrpSize
+        // to right as these values are not stored in db
+        r_Meta->signSet = l_Meta->signSet;
+        r_Meta->mGrpSize = l_Meta->mGrpSize;
+
         if(!(*l_Meta == *r_Meta))
         {
             grpMetaMatch = false;
diff --git a/tests/unittests/libretroshare/gxs/gen_exchange/gxsteststats.cpp b/tests/unittests/libretroshare/gxs/gen_exchange/gxsteststats.cpp
index 8cfad6538..256777c1a 100644
--- a/tests/unittests/libretroshare/gxs/gen_exchange/gxsteststats.cpp
+++ b/tests/unittests/libretroshare/gxs/gen_exchange/gxsteststats.cpp
@@ -81,6 +81,7 @@ void GxsTestStats::testServiceStatistics()
     RsDummyGrp* dgrp2 = new RsDummyGrp();
 
     init(*dgrp1);
+    init(*dgrp2);
     RsTokReqOptions opts;
     opts.mReqType = 45000;
     uint32_t token;
diff --git a/tests/unittests/libretroshare/gxs/nxs_test/nxsdummyservices.h b/tests/unittests/libretroshare/gxs/nxs_test/nxsdummyservices.h
index 9f42c4bbc..48eca0074 100644
--- a/tests/unittests/libretroshare/gxs/nxs_test/nxsdummyservices.h
+++ b/tests/unittests/libretroshare/gxs/nxs_test/nxsdummyservices.h
@@ -110,7 +110,7 @@ namespace rs_nxs_test
 		bool loadReputation(const RsGxsId &id, const std::list<RsPeerId>& peers);
 		bool getReputation(const RsGxsId &id, GixsReputation &rep);
 
-		virtual RsReputations::ReputationLevel overallReputationLevel(const RsGxsId&) { return RsReputations::REPUTATION_NEUTRAL ; }
+		virtual RsReputations::ReputationLevel overallReputationLevel(const RsGxsId&,uint32_t */*identity_flags*/=NULL) { return RsReputations::REPUTATION_NEUTRAL ; }
 
 	private:
 
diff --git a/tests/unittests/libretroshare/serialiser/support.cc b/tests/unittests/libretroshare/serialiser/support.cc
index 2474b77fb..29d7d782e 100644
--- a/tests/unittests/libretroshare/serialiser/support.cc
+++ b/tests/unittests/libretroshare/serialiser/support.cc
@@ -68,14 +68,11 @@ void init_item(RsTlvSecurityKeySet& ks)
 	randString(SHORT_STR, ks.groupId);
 	for(int i=1; i<n; i++)
 	{
-		RsGxsId pub_str;
-		RsGxsId pri_str;
-		pub_str = RsGxsId::random();
-		pri_str = RsGxsId::random();
-
-		RsTlvPublicRSAKey& pub_key = ks.public_keys[pub_str];
-		RsTlvPrivateRSAKey& pri_key = ks.private_keys[pri_str];
+		RsTlvPublicRSAKey pub_key;
+		RsTlvPrivateRSAKey pri_key;
 		GxsSecurity::generateKeyPair(pub_key, pri_key);
+		ks.public_keys[pub_key.keyId] = pub_key;
+		ks.private_keys[pri_key.keyId] = pri_key;
 	}
 }
 
@@ -95,8 +92,6 @@ bool operator==(const RsTlvSecurityKeySet& l, const RsTlvSecurityKeySet& r)
 	return true;
 }
 
-
-
 bool operator==(const RsTlvPublicRSAKey& sk1, const RsTlvPublicRSAKey& sk2)
 {
 
@@ -209,7 +204,6 @@ void init_item(RsTlvKeySignatureSet &kss)
     }
 }
 
-
 bool operator==(const RsTlvImage& img1, const RsTlvImage& img2)
 {
 	if(img1.image_type != img2.image_type) return false;