diff --git a/spec/EXPO.spec.js b/spec/EXPO.spec.js
index b47d398..977a2a8 100644
--- a/spec/EXPO.spec.js
+++ b/spec/EXPO.spec.js
@@ -28,6 +28,13 @@ describe('EXPO', () => {
     expect(function() { new EXPO(undefined); }).toThrow();
   });
 
+  it('does log on invalid payload', async () => {
+    const spy = spyOn(log, 'warn');
+    const expo = new EXPO({});
+    expo.send();
+    expect(spy).toHaveBeenCalledWith('parse-server-push-adapter EXPO', 'invalid push payload');
+  });
+
   it('can send successful EXPO request', async () => {
     const spy = spyOn(log, 'verbose');
 
diff --git a/spec/FCM.spec.js b/spec/FCM.spec.js
index ee4e3ec..ce84b90 100644
--- a/spec/FCM.spec.js
+++ b/spec/FCM.spec.js
@@ -1,21 +1,203 @@
 import path from 'path';
+import log from 'npmlog';
 import FCM from '../src/FCM.js';
 
+const testArgs = {
+  firebaseServiceAccount: path.join(
+    __dirname,
+    '..',
+    'spec',
+    'support',
+    'fakeServiceAccount.json',
+  ),
+};
+
 describe('FCM', () => {
   it('can initialize', () => {
-    const args = {
-      firebaseServiceAccount: path.join(
-        __dirname,
-        '..',
-        'spec',
-        'support',
-        'fakeServiceAccount.json',
-      ),
-    };
-    const fcm = new FCM(args);
+    const fcm = new FCM(testArgs);
     expect(fcm).toBeDefined();
   });
 
+  it('can throw on initializing with invalid args', () => {
+    expect(function() { new FCM(123); }).toThrow();
+    expect(function() { new FCM({}); }).toThrow();
+  });
+
+  it('does log on invalid payload', async () => {
+    const spy = spyOn(log, 'warn');
+    const fcm = new FCM(testArgs);
+    fcm.send();
+    expect(spy).toHaveBeenCalled();
+    expect(spy).toHaveBeenCalledWith('parse-server-push-adapter FCM', 'invalid push payload');
+  });
+
+  it('can send successful FCM android request', async () => {
+    const spyVerbose = spyOn(log, 'verbose').and.callFake(() => {});
+    const spyInfo = spyOn(log, 'info').and.callFake(() => {});
+    const fcm = new FCM(testArgs);
+    spyOn(fcm.sender, 'sendEachForMulticast').and.callFake(() => {
+      return Promise.resolve({
+        responses: [{ success: true }],
+      });
+    });
+    fcm.pushType = 'android';
+    const data = { data: { alert: 'alert' } };
+    const devices = [{ deviceToken: 'token' }];
+    const response = await fcm.send(data, devices);
+    expect(fcm.sender.sendEachForMulticast).toHaveBeenCalled();
+    const args = fcm.sender.sendEachForMulticast.calls.first().args;
+    expect(args.length).toEqual(1);
+    expect(args[0].android.priority).toEqual('high');
+    expect(args[0].android.data.data).toEqual('{"alert":"alert"}');
+    expect(args[0].tokens).toEqual(['token']);
+    expect(spyVerbose).toHaveBeenCalledWith('parse-server-push-adapter FCM', 'tokens with successful pushes: ["token"]');
+    expect(spyInfo).toHaveBeenCalledWith('parse-server-push-adapter FCM', 'sending push to 1 devices');
+    expect(response).toEqual([[{
+      device: { deviceToken: 'token', deviceType: undefined },
+      transmitted: true
+    }]]);
+  });
+
+  it('can send successful FCM android request with apns integer keys', async () => {
+    const spyVerbose = spyOn(log, 'verbose').and.callFake(() => {});
+    const spyInfo = spyOn(log, 'info').and.callFake(() => {});
+    const fcm = new FCM(testArgs);
+    spyOn(fcm.sender, 'sendEachForMulticast').and.callFake(() => {
+      return Promise.resolve({
+        responses: [{ success: true }],
+      });
+    });
+    fcm.pushType = 'android';
+    const data = { data: { alert: 'alert', badge: 1 } };
+    const devices = [{ deviceToken: 'token' }];
+    const response = await fcm.send(data, devices);
+    expect(fcm.sender.sendEachForMulticast).toHaveBeenCalled();
+    const args = fcm.sender.sendEachForMulticast.calls.first().args;
+    expect(args.length).toEqual(1);
+    expect(args[0].android.priority).toEqual('high');
+    // Should not include badge key in data
+    expect(args[0].android.data.data).toEqual('{"alert":"alert"}');
+    expect(args[0].tokens).toEqual(['token']);
+    expect(spyVerbose).toHaveBeenCalledWith('parse-server-push-adapter FCM', 'tokens with successful pushes: ["token"]');
+    expect(spyInfo).toHaveBeenCalledWith('parse-server-push-adapter FCM', 'sending push to 1 devices');
+    expect(response).toEqual([[{
+      device: { deviceToken: 'token', deviceType: undefined },
+      transmitted: true
+    }]]);
+  });
+
+  it('can send successful FCM apple request with alert', async () => {
+    const spyVerbose = spyOn(log, 'verbose').and.callFake(() => {});
+    const spyInfo = spyOn(log, 'info').and.callFake(() => {});
+    const fcm = new FCM(testArgs);
+    spyOn(fcm.sender, 'sendEachForMulticast').and.callFake(() => {
+      return Promise.resolve({
+        responses: [{ success: true }],
+      });
+    });
+    fcm.pushType = 'apple';
+    const data = { data: { alert: 'alert' } };
+    const devices = [{ deviceToken: 'token' }];
+    const response = await fcm.send(data, devices);
+    expect(fcm.sender.sendEachForMulticast).toHaveBeenCalled();
+    const args = fcm.sender.sendEachForMulticast.calls.first().args;
+    expect(args.length).toEqual(1);
+    expect(args[0].apns.payload).toEqual({ aps: { alert: { body: 'alert' } } });
+    expect(args[0].apns.headers).toEqual({ 'apns-push-type': 'alert' });
+    expect(args[0].tokens).toEqual(['token']);
+    expect(spyVerbose).toHaveBeenCalledWith('parse-server-push-adapter FCM', 'tokens with successful pushes: ["token"]');
+    expect(spyInfo).toHaveBeenCalledWith('parse-server-push-adapter FCM', 'sending push to 1 devices');
+    expect(response).toEqual([[{
+      device: { deviceToken: 'token', deviceType: undefined },
+      transmitted: true
+    }]]);
+  });
+
+  it('can send successful FCM apple request with title', async () => {
+    const spyVerbose = spyOn(log, 'verbose').and.callFake(() => {});
+    const spyInfo = spyOn(log, 'info').and.callFake(() => {});
+    const fcm = new FCM(testArgs);
+    spyOn(fcm.sender, 'sendEachForMulticast').and.callFake(() => {
+      return Promise.resolve({
+        responses: [{ success: true }],
+      });
+    });
+    fcm.pushType = 'apple';
+    const data = { data: { title: 'title' } };
+    const devices = [{ deviceToken: 'token' }];
+    const response = await fcm.send(data, devices);
+    expect(fcm.sender.sendEachForMulticast).toHaveBeenCalled();
+    const args = fcm.sender.sendEachForMulticast.calls.first().args;
+    expect(args.length).toEqual(1);
+    expect(args[0].apns.payload).toEqual({ aps: { alert: { title: 'title' } } });
+    expect(args[0].apns.headers).toEqual({ 'apns-push-type': 'alert' });
+    expect(args[0].tokens).toEqual(['token']);
+    expect(spyVerbose).toHaveBeenCalledWith('parse-server-push-adapter FCM', 'tokens with successful pushes: ["token"]');
+    expect(spyInfo).toHaveBeenCalledWith('parse-server-push-adapter FCM', 'sending push to 1 devices');
+    expect(response).toEqual([[{
+      device: { deviceToken: 'token', deviceType: undefined },
+      transmitted: true
+    }]]);
+  });
+
+  it('can send failed FCM request', async () => {
+    const spyInfo = spyOn(log, 'info').and.callFake(() => {});
+    const spyError = spyOn(log, 'error').and.callFake(() => {});
+    const fcm = new FCM(testArgs);
+    spyOn(fcm.sender, 'sendEachForMulticast').and.callFake(() => {
+      return Promise.resolve({
+        responses: [{ success: false, error: 'testing failed' }],
+      });
+    });
+    fcm.pushType = 'android';
+    const data = { data: { alert: 'alert' } };
+    const devices = [{ deviceToken: 'token', deviceType: 'apple' }];
+    const response = await fcm.send(data, devices);
+    expect(fcm.sender.sendEachForMulticast).toHaveBeenCalled();
+    const args = fcm.sender.sendEachForMulticast.calls.first().args;
+    expect(args.length).toEqual(1);
+    expect(args[0].android.priority).toEqual('high');
+    expect(args[0].android.data.data).toEqual('{"alert":"alert"}');
+    expect(args[0].tokens).toEqual(['token']);
+    expect(spyInfo).toHaveBeenCalledWith('parse-server-push-adapter FCM', 'sending push to 1 devices');
+    expect(spyError.calls.all()[0].args).toEqual(['parse-server-push-adapter FCM', 'failed to send to token with error: "testing failed"']);
+    expect(spyError.calls.all()[1].args).toEqual(['parse-server-push-adapter FCM', 'tokens with failed pushes: ["token"]']);
+    expect(response).toEqual([[{
+      device: { deviceToken: 'token', deviceType: 'apple' },
+      response: { error: 'testing failed'},
+      transmitted: false,
+    }]]);
+  });
+
+  it('can handle FCM request error', async () => {
+    const spyInfo = spyOn(log, 'info').and.callFake(() => {});
+    const spyError = spyOn(log, 'error').and.callFake(() => {});
+    const fcm = new FCM(testArgs);
+    spyOn(fcm.sender, 'sendEachForMulticast').and.callFake(() => {
+      return Promise.reject('testing error abort');
+    });
+    fcm.pushType = 'android';
+    const data = { data: { alert: 'alert' } };
+    const devices = [{ deviceToken: 'token' }];
+    await fcm.send(data, devices);
+    expect(fcm.sender.sendEachForMulticast).toHaveBeenCalled();
+    expect(spyInfo).toHaveBeenCalledWith('parse-server-push-adapter FCM', 'sending push to 1 devices');
+    expect(spyError).toHaveBeenCalledWith('parse-server-push-adapter FCM', 'error sending push: testing error abort');
+  });
+
+  it('FCM request invalid push type', async () => {
+    const fcm = new FCM(testArgs);
+    fcm.pushType = 'invalid';
+    const data = { data: { alert: 'alert' } };
+    const devices = [{ deviceToken: 'token' }];
+    try {
+      await fcm.send(data, devices);
+      expect(true).toBe(false);
+    } catch (e) {
+      expect(e.message).toBe('Unsupported push type, apple or android only.');
+    }
+  });
+
   it('can use a raw FCM payload', () => {
     // If the payload is wrapped inside a key named 'rawPayload', a user can use the raw FCM payload structure
     // See: https://firebase.google.com/docs/reference/fcm/rest/v1/projects.messages
diff --git a/spec/WEB.spec.js b/spec/WEB.spec.js
index 1eb2a7e..e1a69ce 100644
--- a/spec/WEB.spec.js
+++ b/spec/WEB.spec.js
@@ -55,11 +55,11 @@ describe('WEB', () => {
     expect(function() { new WEB(undefined); }).toThrow();
   });
 
-  it('does log on invalid APNS notification', async () => {
+  it('does log on invalid payload', async () => {
     const spy = spyOn(log, 'warn');
     const web = new WEB({ vapidDetails });
     web.send();
-    expect(spy).toHaveBeenCalled();
+    expect(spy).toHaveBeenCalledWith('parse-server-push-adapter WEB', 'invalid push payload');
   });
 
   it('can send successful WEB request', async () => {