         ("testGCM", testGCM),
         ("testNotification", testNotification),
         ("testNotificationToJSON", testNotificationToJSON),
+        ("testNotificationFields", testNotificationFields),
+        ("testNotificationMessage", testNotificationMessage),
+        ("testNotificationBodyWithTitle", testNotificationBodyWithTitle),
         ("testPushMessage", testPushMessage),
+        ("testPushMessageFields", testPushMessageFields),
         ("testSendMessageToDevice", testSendMessageToDevice),
-        ("testSendMessageToMultipleDevices", testSendMessageToMultipleDevices)
+        ("testSendMessageToMultipleDevices", testSendMessageToMultipleDevices),
+        ("testDeviceGroup", testDeviceGroup),
+        ("testNoDroplet", testNoDroplet),
+        ("testNoDroplet", testNoDroplet2),
+        ("testNoDroplet", testNoDroplet3)
     ]
     
     var drop: Droplet! = nil

        } catch {
            XCTFail()
        }
        XCTAssertNotNil(message)
    }
    

        XCTAssertNotNil(gcmPayload)
    }
    
    func testNotificationMessage() {
        let gcmPayload = GCMPayload(message: "message")
        do {
            let json = try gcmPayload.makeJSON()
            let value: String = try json.extract("body")
            XCTAssertNotNil(value)
        } catch {
            XCTFail()
        }
        XCTAssertNotNil(gcmPayload)
    }
    
    func testNotificationBodyWithTitle() {
        let gcmPayload = GCMPayload(title: "title", body: "body")
        do {
            let json = try gcmPayload.makeJSON()
            let value1: String = try json.extract("title")
            XCTAssertNotNil(value1)
            let value2: String = try json.extract("body")
            XCTAssertNotNil(value2)
        } catch {
            XCTFail()
        }
        XCTAssertNotNil(gcmPayload)
    }
    
    func testNotificationToJSON() {
        let gcmPayload = GCMPayload()
        var json: JSON?
