diff --git a/federation/service/mapper_test.go b/federation/service/mapper_test.go
index 272660169..09e2723a5 100644
--- a/federation/service/mapper_test.go
+++ b/federation/service/mapper_test.go
@@ -11,7 +11,6 @@ import (
 
 func TestMapper_merge(t *testing.T) {
 	var (
-		// out = &
 		tcc = []struct {
 			name   string
 			m      string
@@ -59,3 +58,40 @@ func TestMapper_merge(t *testing.T) {
 		})
 	}
 }
+
+func TestMapper_prepare(t *testing.T) {
+	var (
+		tcc = []struct {
+			name   string
+			m      string
+			expect ct.RecordValueSet
+		}{
+			{
+				"prepare values",
+				`[
+					{"origin":{"kind":"String","name":"AccountName","label":"Account Name","isMulti":false},"destination":{"kind":"String","name":"AccountName","label":"Account Name","isMulti":false}},
+					{"origin":{"kind":"String","name":"Phone","label":"Phone","isMulti":false},"destination":{"kind":"String","name":"Phone","label":"Phone","isMulti":false}},
+					{"origin":{"kind":"Url","name":"Twitter","label":"Twitter","isMulti":false},"destination":{"kind":"Url","name":"Twitter","label":"Twitter","isMulti":false}}
+				]`,
+				ct.RecordValueSet{&ct.RecordValue{Name: "AccountName", Value: ""}, &ct.RecordValue{Name: "Phone", Value: ""}, &ct.RecordValue{Name: "Twitter", Value: ""}},
+			},
+		}
+	)
+
+	for _, tc := range tcc {
+		t.Run(tc.name, func(t *testing.T) {
+			var (
+				req = require.New(t)
+
+				mapper = &Mapper{}
+			)
+
+			// dont catch any helper errors
+			mm := &types.ModuleFieldMappingSet{}
+			json.Unmarshal([]byte(tc.m), mm)
+
+			out := mapper.Prepare(*mm)
+			req.Equal(tc.expect, out)
+		})
+	}
+}
diff --git a/federation/types/syncer_uri.go b/federation/types/syncer_uri.go
index dfefda53f..4d2347822 100644
--- a/federation/types/syncer_uri.go
+++ b/federation/types/syncer_uri.go
@@ -90,11 +90,7 @@ func parseLastSync(lastSync string) (*time.Time, error) {
 	}
 
 	// try different format if above fails
-	if t, err := time.Parse(time.RFC3339, lastSync); err == nil {
-		return &t, nil
-	}
-
-	t, err := time.Parse("2006-01-02", lastSync)
+	t, err := time.Parse(time.RFC3339, lastSync)
 
 	if err != nil {
 		return nil, err
diff --git a/federation/types/syncer_uri_test.go b/federation/types/syncer_uri_test.go
index 1e74a7000..577645939 100644
--- a/federation/types/syncer_uri_test.go
+++ b/federation/types/syncer_uri_test.go
@@ -1,6 +1,7 @@
 package types
 
 import (
+	"fmt"
 	"testing"
 	"time"
 
@@ -42,7 +43,7 @@ func TestSyncerURIString(t *testing.T) {
 		{
 			name:   "last sync",
 			url:    &SyncerURI{Path: "/relative/path", LastSync: &now},
-			expect: "/relative/path?limit=0&lastSync=2020-10-23T11:11:11Z",
+			expect: fmt.Sprintf("/relative/path?limit=0&lastSync=%d", now.Unix()),
 		},
 	}
 
@@ -60,23 +61,29 @@ func TestSyncerURIParse(t *testing.T) {
 		req = require.New(t)
 	)
 
-	// TODO - add a parse last sync date
-	// now, _ := time.Parse("2006-01-02 15:04:05", "2020-10-23 11:11:11")
-
 	tests := []struct {
 		name   string
 		url    string
 		expect *SyncerURI
+		err    string
 	}{
 		{
 			name:   "parse limit",
 			url:    "https://example.url?limit=11",
 			expect: &SyncerURI{BaseURL: "https://example.url", Limit: 11},
+			err:    "",
 		},
 		{
 			name:   "parse path",
 			url:    "/path/to/endpoint/",
 			expect: &SyncerURI{Path: "/path/to/endpoint/"},
+			err:    "",
+		},
+		{
+			name:   "parse invalid url",
+			url:    "ht tps:/ /in valid",
+			expect: &SyncerURI{},
+			err:    `parse "ht tps:/ /in valid": first path segment in URL cannot contain colon`,
 		},
 	}
 
@@ -85,8 +92,47 @@ func TestSyncerURIParse(t *testing.T) {
 			s := &SyncerURI{}
 			err := s.Parse(tt.url)
 
+			errString := ""
+			if err != nil {
+				errString = err.Error()
+			}
+
 			req.Equal(tt.expect, s)
-			req.NoError(err)
+			req.Equal(tt.err, errString)
 		})
 	}
 }
+
+func TestSyncerURIParseLastSync(t *testing.T) {
+	var (
+		req = require.New(t)
+	)
+
+	tests := []struct {
+		name   string
+		url    string
+		expect string
+	}{
+		{
+			name:   "parse timestamp",
+			url:    "https://example.url?limit=11&lastSync=1603451471",
+			expect: "2020-10-23T13:11:11+02:00",
+		},
+		{
+			name:   "parse RFC3339",
+			url:    "https://example.url?limit=11&lastSync=2020-10-23T13:11:11Z",
+			expect: "2020-10-23T13:11:11Z",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			s := &SyncerURI{}
+			err := s.Parse(tt.url)
+
+			req.NoError(err)
+			req.Equal(tt.expect, s.LastSync.Format(time.RFC3339))
+		})
+	}
+
+}
diff --git a/tests/federation/node_pairing_test.go b/tests/federation/node_pairing_test.go
index b29c77018..bc26bfe10 100644
--- a/tests/federation/node_pairing_test.go
+++ b/tests/federation/node_pairing_test.go
@@ -53,7 +53,7 @@ func TestSuccessfulNodePairing(t *testing.T) {
 		checkNodeStatus = func(ID uint64, status string) {
 			n := h.lookupNodeByID(aNodeID)
 			h.a.NotNil(n)
-			h.a.Equal(n.Status, status)
+			h.a.Equal(status, n.Status)
 		}
 
 		getNodeAuthToken = func(ID uint64) string {