diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/services/sensors/ZephyrMessageParserTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/services/sensors/ZephyrMessageParserTest.java
index 6cebf3692..11a08fe49 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/services/sensors/ZephyrMessageParserTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/services/sensors/ZephyrMessageParserTest.java
@@ -9,10 +9,17 @@ public class ZephyrMessageParserTest extends TestCase {
   ZephyrMessageParser parser = new ZephyrMessageParser();
 
   public void testIsValid() {
-    byte[] buf = new byte[60];
+    byte[] smallBuf = new byte[59];
+    assertFalse(parser.isValid(smallBuf));
+    // A complete and valid Zephyr HxM packet
+    byte[] buf = { 2,38,55,26,0,49,101,80,0,49,98,100,42,113,120,-53,-24,-60,-123,-61,117,-69,42,-75,74,-78,51,-79,27,-83,28,-88,28,-93,29,-98,25,-103,26,-108,26,-113,59,-118,0,0,0,0,0,0,-22,3,125,1,48,0,96,4,30,0 };
+    // Make buffer invalid
+    buf[0] = buf[58] = buf[59] = 0;
     assertFalse(parser.isValid(buf));
     buf[0] = 0x02;
     assertFalse(parser.isValid(buf));
+    buf[58] = 0x1E;
+    assertFalse(parser.isValid(buf));
     buf[59] = 0x03;
     assertTrue(parser.isValid(buf));
   }
@@ -20,10 +27,19 @@ public class ZephyrMessageParserTest extends TestCase {
   public void testParseBuffer() {
     byte[] buf = new byte[60];
     buf[12] = 50;
+    buf[11] = 51;
+    buf[56] = 32;
+    buf[57] = 0;
     Sensor.SensorDataSet sds = parser.parseBuffer(buf);
     assertTrue(sds.hasHeartRate());
     assertTrue(sds.getHeartRate().getState() == Sensor.SensorState.SENDING);
     assertEquals(50, sds.getHeartRate().getValue());
+    assertTrue(sds.hasPower());
+    assertTrue(sds.getPower().getState() == Sensor.SensorState.SENDING);
+    assertEquals(51, sds.getPower().getValue());
+    assertTrue(sds.hasCadence());
+    assertTrue(sds.getCadence().getState() == Sensor.SensorState.SENDING);
+    assertEquals(2, sds.getCadence().getValue());
   }
 
   public void testFindNextAlignment() {