diff --git a/test/api/inAppPurchases.coffee b/test/api/inAppPurchases.coffee
index d40ad41fcc..aac9550c10 100644
--- a/test/api/inAppPurchases.coffee
+++ b/test/api/inAppPurchases.coffee
@@ -8,15 +8,124 @@ iapMock = { }
 inApp.__set__('iap', iapMock)
 
 describe 'In-App Purchases', ->
-  describe 'iOS', ->
-    req = { body: { transaction: { reciept: 'foo' } } }
-    res = { 
-      locals: { user: { _id: 'user' } } 
+  describe 'Android', ->
+    req = {
+      body: {
+        transaction: {
+          reciept: 'foo'
+          signature: 'sig'
+        }
+      }
+    }
+    res = {
+      locals: { user: { _id: 'user' } }
       json: sinon.spy()
     }
     next = -> true
     paymentSpy = sinon.spy()
-    inApp.__set__('payments.buyGems', paymentSpy)
+
+    before ->
+      inApp.__set__('payments.buyGems', paymentSpy)
+
+    afterEach ->
+      paymentSpy.reset()
+      res.json.reset()
+
+    context 'successful app purchase', ->
+      before ->
+        iapMock.setup = (cb)-> return cb(null)
+        iapMock.validate = (iapGoogle, iapBodyReciept, cb)-> return cb(null, true)
+        iapMock.isValidated = (googleRes)-> return googleRes
+        iapMock.GOOGLE = 'google'
+
+      it 'calls res.json with succesful result object', ->
+        expectedResObj = {
+          ok: true
+          data: true
+        }
+
+        inApp.androidVerify(req, res, next)
+
+        expect(res.json).to.be.calledOnce
+        expect(res.json).to.be.calledWith(expectedResObj)
+
+      it 'calls payments.buyGems function', ->
+        inApp.androidVerify(req, res, next)
+
+        expect(paymentSpy).to.be.calledOnce
+        expect(paymentSpy).to.be.calledWith({user: res.locals.user, paymentMethod:'IAP GooglePlay'})
+
+    context 'error in setup', ->
+      before ->
+        iapMock.setup = (cb)-> return cb("error in setup")
+
+      it 'calls res.json with setup error object', ->
+        expectedResObj = {
+          ok: false
+          data: 'IAP Error'
+        }
+
+        inApp.androidVerify(req, res, next)
+
+        expect(res.json).to.be.calledOnce
+        expect(res.json).to.be.calledWith(expectedResObj)
+
+      it 'does not calls payments.buyGems function', ->
+        inApp.androidVerify(req, res, next)
+
+        expect(paymentSpy).to.not.be.called
+
+    context 'error in validation', ->
+      before ->
+        iapMock.setup = (cb)-> return cb(null)
+        iapMock.validate = (iapGoogle, iapBodyReciept, cb)-> return cb('error in validation', true)
+
+      it 'calls res.json with validation error object', ->
+        expectedResObj = {
+          ok: false
+          data: {
+            code: 6778001
+            message: 'error in validation'
+          }
+        }
+
+        inApp.androidVerify(req, res, next)
+
+        expect(res.json).to.be.calledOnce
+        expect(res.json).to.be.calledWith(expectedResObj)
+
+      it 'does not calls payments.buyGems function', ->
+        inApp.androidVerify(req, res, next)
+
+        expect(paymentSpy).to.not.be.called
+
+    context 'iap is not valid', ->
+      before ->
+        iapMock.setup = (cb)-> return cb(null)
+        iapMock.validate = (iapGoogle, iapBodyReciept, cb)-> return cb(null, false)
+        iapMock.isValidated = (googleRes)-> return googleRes
+
+      it 'does not call res.json', ->
+        inApp.androidVerify(req, res, next)
+
+        expect(res.json).to.not.be.called
+
+      it 'does not calls payments.buyGems function', ->
+        inApp.androidVerify(req, res, next)
+
+        expect(paymentSpy).to.not.be.called
+
+  describe 'iOS', ->
+    req = { body: { transaction: { reciept: 'foo' } } }
+    res = {
+      locals: { user: { _id: 'user' } }
+      json: sinon.spy()
+    }
+    next = -> true
+    paymentSpy = sinon.spy()
+
+    before ->
+      inApp.__set__('payments.buyGems', paymentSpy)
 
     afterEach ->
       paymentSpy.reset()
@@ -27,7 +136,7 @@ describe 'In-App Purchases', ->
         iapMock.setup = (cb)-> return cb(null)
         iapMock.validate = (iapApple, iapBodyReciept, cb)-> return cb(null, true)
         iapMock.isValidated = (appleRes)-> return appleRes
-        iapMock.getPurchaseData = (appleRes)-> 
+        iapMock.getPurchaseData = (appleRes)->
           return [{ productId: 'com.habitrpg.ios.Habitica.20gems' }]
         iapMock.APPLE = 'apple'
 
@@ -113,7 +222,7 @@ describe 'In-App Purchases', ->
         iapMock.setup = (cb)-> return cb(null)
         iapMock.validate = (iapApple, iapBodyReciept, cb)-> return cb(null, true)
         iapMock.isValidated = (appleRes)-> return appleRes
-        iapMock.getPurchaseData = (appleRes)-> 
+        iapMock.getPurchaseData = (appleRes)->
           return []
         iapMock.APPLE = 'apple'
 
@@ -141,7 +250,7 @@ describe 'In-App Purchases', ->
         iapMock.setup = (cb)-> return cb(null)
         iapMock.validate = (iapApple, iapBodyReciept, cb)-> return cb(null, true)
         iapMock.isValidated = (appleRes)-> return appleRes
-        iapMock.getPurchaseData = (appleRes)-> 
+        iapMock.getPurchaseData = (appleRes)->
           return [{ productId: 'com.another.company' }]
         iapMock.APPLE = 'apple'
 
diff --git a/website/src/controllers/payments/iap.js b/website/src/controllers/payments/iap.js
index cc8360f8f4..ff8a9375b7 100644
--- a/website/src/controllers/payments/iap.js
+++ b/website/src/controllers/payments/iap.js
@@ -63,8 +63,7 @@ exports.androidVerify = function(req, res, next) {
 
         payments.buyGems({user:user, paymentMethod:'IAP GooglePlay'});
 
-        // yay good!
-        res.json(resObj);
+        return res.json(resObj);
       }
     });
   });