diff --git a/test/modules/normalizers/parseTuples.test.js b/test/modules/normalizers/parseTuples.test.js
index 46f69086..cf695339 100644
--- a/test/modules/normalizers/parseTuples.test.js
+++ b/test/modules/normalizers/parseTuples.test.js
@@ -4,25 +4,25 @@ import _ from 'lodash'
 describe('Parse tuples', () => {
   it('parse tuples', () => {
     const tuples = [
-      { tuple: [":enabled", false]},
-      { tuple: [":host", "localhost"]},
-      { tuple: [":port", 389]},
+      { tuple: [':enabled', false]},
+      { tuple: [':host', 'localhost']},
+      { tuple: [':port', 389]},
       { tuple: [':tlsopts', ['test', 'test1']]},
-      { tuple: [':sslopts', [{ tuple: [":cacertfile", "path/to/file"] }, { tuple: [":verify", ":verify_peer"] }]]}
+      { tuple: [':sslopts', [{ tuple: [':cacertfile', 'path/to/file'] }, { tuple: [':verify', ':verify_peer'] }]]}
     ]
     const expectedResult = {
       ':enabled': false,
       ':host': 'localhost',
       ':port': 389,
       ':tlsopts': ['test', 'test1'],
-      ':sslopts': { ':cacertfile': "path/to/file", ':verify': ":verify_peer" }
+      ':sslopts': { ':cacertfile': 'path/to/file', ':verify': ':verify_peer' }
     }
 
     const result = parseTuples(tuples, ':ldap')
     expect(_.isEqual(expectedResult, result)).toBeTruthy()
   })
 
-  it('parse rate limiters', () => {
+  it('parse rate limiters setting', () => {
     const tuples = [
       { tuple: [':authentication', { tuple: [60000, 15] }]},
       { tuple: [':app_account_creation', [{ tuple: [100, 55] }, { tuple: [150, 10] }]]}
@@ -36,7 +36,7 @@ describe('Parse tuples', () => {
     expect(_.isEqual(expectedResult, result)).toBeTruthy()
   })
 
-  it('parse icons', () => {
+  it('parse icons setting', () => {
     const tuples = [
       { tuple: [':icons', [
         { ':src': '/static/logo.png', ':type': 'image/png' },
@@ -63,11 +63,11 @@ describe('Parse tuples', () => {
     expect(_.isEqual(expectedResult, result)).toBeTruthy()
   })
 
-  it('parse retries', () => {
+  it('parse retries setting', () => {
     const tuples = [
       { tuple: [':retries', [
-        { tuple: [":federator_incoming", 5] },
-        { tuple: [":federator_outgoing", 10] }
+        { tuple: [':federator_incoming', 5] },
+        { tuple: [':federator_outgoing', 10] }
       ]]}
     ]
 
@@ -82,15 +82,75 @@ describe('Parse tuples', () => {
 
   it('parse objects', () => {
     const tuples = [
-      { tuple: [":pleroma_fe", { ':alwaysShowSubjectInput': true, ':redirectRootNoLogin': "/main/all" }]},
-      { tuple: [":masto_fe", { ':showInstanceSpecificPanel': true }]}
+      { tuple: [':pleroma_fe', { ':alwaysShowSubjectInput': true, ':redirectRootNoLogin': '/main/all' }]},
+      { tuple: [':masto_fe', { ':showInstanceSpecificPanel': true }]}
     ]
     const expectedResult = {
       ':masto_fe': { ':showInstanceSpecificPanel': true },
-      ':pleroma_fe': { ':alwaysShowSubjectInput': true, ':redirectRootNoLogin': "/main/all" }
+      ':pleroma_fe': { ':alwaysShowSubjectInput': true, ':redirectRootNoLogin': '/main/all' }
     }
 
-    const result = parseTuples(tuples, ":frontend_configurations")
+    const result = parseTuples(tuples, ':frontend_configurations')
+    expect(_.isEqual(expectedResult, result)).toBeTruthy()
+  })
+
+  it('parse ip', () => {
+    const tuples = [
+      { tuple: [':enabled', false]},
+      { tuple: [':ip', { tuple: [0, 0, 0, 0] }]}
+    ]
+    const expectedResult = { ':enabled': false, ':ip': '0.0.0.0' }
+
+    const result = parseTuples(tuples, ':gopher')
+    expect(_.isEqual(expectedResult, result)).toBeTruthy()
+  })
+
+  it('parse prune setting that is a tuple', () => {
+    const tuples = [
+      { tuple: [':verbose', false]},
+      { tuple: [':prune', { tuple: [':maxlen', 1500] }]},
+      { tuple: [':queues', [
+        { tuple: [':activity_expiration', 10]},
+        { tuple: [':federator_incoming', 50]}
+      ] ]}
+    ]
+    const expectedResult = {
+      ':verbose': false,
+      ':prune': [':maxlen', 1500],
+      ':queues': { ':activity_expiration': 10, ':federator_incoming': 50 } }
+
+    const result = parseTuples(tuples, 'Oban')
+    expect(_.isEqual(expectedResult, result)).toBeTruthy()
+  })
+
+  it('parse prune setting that is an atom', () => {
+    const tuples = [{ tuple: [':prune', ':disabled' ]}]
+    const expectedResult = { ':prune': [':disabled'] }
+
+    const result = parseTuples(tuples, 'Oban')
+    expect(_.isEqual(expectedResult, result)).toBeTruthy()
+  })
+
+  it('parse mrf_keyword settings', () => {
+    const tuples = [
+      { tuple: [':reject', ['foo', '~r/foo/iu'] ]},
+      { tuple: [':replace', [{ tuple: ['pattern', 'replacement']}, { tuple: ['foo', 'bar']}]]}
+    ]
+    const expectedResult = {
+      ':reject': ['foo', '~r/foo/iu'],
+      ':replace': [{ 'pattern': { value:'replacement' }}, { 'foo': { value:'bar' }}]
+    }
+
+    const parsed = parseTuples(tuples, ':mrf_keyword')
+    expect(typeof parsed).toBe('object')
+    expect(':reject' in parsed).toBeTruthy()
+    expect(':replace' in parsed).toBeTruthy()
+
+    const result = { ...parsed, ':replace': parsed[':replace'].map(el => {
+      const key = Object.keys(el)[0]
+      const { id, ...rest } = el[key]
+      return { [key]: rest }
+    })}
     expect(_.isEqual(expectedResult, result)).toBeTruthy()
   })
 })