         ("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(json)
    }
    
    func testNotificationFields() {
        var gcmPayload = GCMPayload()
        gcmPayload.title = "title"
        gcmPayload.body = "body"
        gcmPayload.sound = "sound"
        gcmPayload.tag = "tag"
        gcmPayload.color = "color"
        gcmPayload.clickAction = "click_action"
        gcmPayload.bodyLocKey = "body_loc_key"
        gcmPayload.bodyLocArgs = JSON([:])
        gcmPayload.titleLocKey = JSON([:])
        gcmPayload.titleLocArgs = JSON([:])
        do {
            let json = try gcmPayload.makeJSON()
            try ["title","body","sound","tag","color","click_action","body_loc_key"].forEach() { key in
                let value: String = try json.extract(key)
                XCTAssertNotNil(value)
            }
        } catch {
            XCTFail()
        }
        do {
            let json = try gcmPayload.makeJSON()
            try ["body_loc_args","title_loc_key","title_loc_args"].forEach() { key in
                let value: JSON = try json.extract(key)
                XCTAssertNotNil(value)
            }
        } catch {
            XCTFail()
        }
        XCTAssertNotNil(gcmPayload)
    }
    
    func testPushMessage() {
        var message: PushMessage?
        do {
