diff --git a/src/keys.js b/src/keys.js
index b3fb0b4..0edf9f4 100644
--- a/src/keys.js
+++ b/src/keys.js
@@ -187,14 +187,14 @@ exports.fetchURI = (uri) => {
     switch (match[1]) {
       case 'hkp':
         resolve(
-          fetchHKP(match[3] ? match[3] : match[2], match[3] ? match[2] : null)
+          exports.fetchHKP(match[3] ? match[3] : match[2], match[3] ? match[2] : null)
         )
         break
       case 'wkd':
-        resolve(fetchWKD(match[2]))
+        resolve(exports.fetchWKD(match[2]))
         break
       case 'kb':
-        resolve(fetchKeybase(match[2], match.length >= 4 ? match[3] : null))
+        resolve(exports.fetchKeybase(match[2], match.length >= 4 ? match[3] : null))
         break
       default:
         reject('Invalid URI protocol')
diff --git a/src/signatures.js b/src/signatures.js
index 987c432..f107f14 100644
--- a/src/signatures.js
+++ b/src/signatures.js
@@ -49,7 +49,7 @@ const process = (signature) => {
     try {
       sigData = await openpgp.cleartext.readArmored(signature)
     } catch (error) {
-      reject('invalid_signature')
+      reject(new Error('invalid_signature'))
       return
     }
 
@@ -84,7 +84,7 @@ const process = (signature) => {
     if (sigKeys.length > 0) {
       try {
         result.key.uri = sigKeys[0]
-        result.key.data = await keys.fetch.uri(result.key.uri)
+        result.key.data = await keys.fetchURI(result.key.uri)
         result.key.fetchMethod = result.key.uri.split(':')[0]
       } catch (e) {}
     }
@@ -92,7 +92,7 @@ const process = (signature) => {
     if (!result.key.data && signersUserId) {
       try {
         result.key.uri = `wkd:${signersUserId}`
-        result.key.data = await keys.fetch.uri(result.key.uri)
+        result.key.data = await keys.fetchURI(result.key.uri)
         result.key.fetchMethod = 'wkd'
       } catch (e) {}
     }
@@ -103,10 +103,10 @@ const process = (signature) => {
         result.key.uri = `hkp:${match[2]}:${
           issuerKeyId ? issuerKeyId : signersUserId
         }`
-        result.key.data = await keys.fetch.uri(result.key.uri)
+        result.key.data = await keys.fetchURI(result.key.uri)
         result.key.fetchMethod = 'hkp'
       } catch (e) {
-        reject('key_not_found')
+        reject(new Error('key_not_found'))
         return
       }
     }
diff --git a/test/claimDefinitions.js b/test/claimDefinitions.test.js
similarity index 100%
rename from test/claimDefinitions.js
rename to test/claimDefinitions.test.js
diff --git a/test/keys.test.js b/test/keys.test.js
index 4a8d034..684be42 100644
--- a/test/keys.test.js
+++ b/test/keys.test.js
@@ -49,61 +49,61 @@ x77L7mBkREbuZpFoD/c=
 =w7qB
 -----END PGP PUBLIC KEY BLOCK-----`
 
-describe('keys.fetch.uri', () => {
+describe('keys.fetchURI', () => {
   it('should be a function (1 argument)', () => {
-    expect(doipjs.keys.fetch.uri).to.be.a('function')
-    expect(doipjs.keys.fetch.uri).to.have.length(1)
+    expect(doipjs.keys.fetchURI).to.be.a('function')
+    expect(doipjs.keys.fetchURI).to.have.length(1)
   })
   it('should return a Key object when provided a hkp: uri', async () => {
     expect(
-      await doipjs.keys.fetch.uri(`hkp:${pubKeyFingerprint}`)
+      await doipjs.keys.fetchURI(`hkp:${pubKeyFingerprint}`)
     ).to.be.instanceOf(openpgp.key.Key)
   }).timeout('12s')
   it('should reject when provided an invalid uri', () => {
     return expect(
-      doipjs.keys.fetch.uri(`inv:${pubKeyFingerprint}`)
+      doipjs.keys.fetchURI(`inv:${pubKeyFingerprint}`)
     ).to.eventually.be.rejectedWith('Invalid URI protocol')
   }).timeout('12s')
 })
 
-describe('keys.fetch.hkp', () => {
+describe('keys.fetchHKP', () => {
   it('should be a function (2 arguments)', () => {
-    expect(doipjs.keys.fetch.hkp).to.be.a('function')
-    expect(doipjs.keys.fetch.hkp).to.have.length(2)
+    expect(doipjs.keys.fetchHKP).to.be.a('function')
+    expect(doipjs.keys.fetchHKP).to.have.length(2)
   })
   it('should return a Key object when provided a valid fingerprint', async () => {
-    expect(await doipjs.keys.fetch.hkp(pubKeyFingerprint)).to.be.instanceOf(
+    expect(await doipjs.keys.fetchHKP(pubKeyFingerprint)).to.be.instanceOf(
       openpgp.key.Key
     )
   })
   it('should return a Key object when provided a valid email address', async () => {
-    expect(await doipjs.keys.fetch.hkp(pubKeyEmail)).to.be.instanceOf(
+    expect(await doipjs.keys.fetchHKP(pubKeyEmail)).to.be.instanceOf(
       openpgp.key.Key
     )
   })
   it('should reject when provided an invalid fingerprint', async () => {
     return expect(
-      doipjs.keys.fetch.hkp('4637202523e7c1309ab79e99ef2dc5827b445f4b')
+      doipjs.keys.fetchHKP('4637202523e7c1309ab79e99ef2dc5827b445f4b')
     ).to.eventually.be.rejectedWith(
       'Key does not exist or could not be fetched'
     )
   })
   it('should reject when provided an invalid email address', async () => {
     return expect(
-      doipjs.keys.fetch.hkp('invalid@doip.rocks')
+      doipjs.keys.fetchHKP('invalid@doip.rocks')
     ).to.eventually.be.rejectedWith(
       'Key does not exist or could not be fetched'
     )
   })
 })
 
-describe('keys.fetch.plaintext', () => {
+describe('keys.fetchPlaintext', () => {
   it('should be a function (1 argument)', () => {
-    expect(doipjs.keys.fetch.plaintext).to.be.a('function')
-    expect(doipjs.keys.fetch.plaintext).to.have.length(1)
+    expect(doipjs.keys.fetchPlaintext).to.be.a('function')
+    expect(doipjs.keys.fetchPlaintext).to.have.length(1)
   })
   it('should return a Key object', async () => {
-    expect(await doipjs.keys.fetch.plaintext(pubKeyPlaintext)).to.be.instanceOf(
+    expect(await doipjs.keys.fetchPlaintext(pubKeyPlaintext)).to.be.instanceOf(
       openpgp.key.Key
     )
   })
@@ -115,7 +115,7 @@ describe('keys.process', () => {
     expect(doipjs.keys.process).to.have.length(1)
   })
   it('should return an object with specific keys', async () => {
-    const pubKey = await doipjs.keys.fetch.plaintext(pubKeyPlaintext)
+    const pubKey = await doipjs.keys.fetchPlaintext(pubKeyPlaintext)
     const obj = await doipjs.keys.process(pubKey)
     expect(obj).to.have.keys([
       'users',