diff --git a/src/se/vidstige/jadb/AndroidDevice.java b/src/se/vidstige/jadb/AndroidDevice.java
index 1e9518c..7e017e6 100644
--- a/src/se/vidstige/jadb/AndroidDevice.java
+++ b/src/se/vidstige/jadb/AndroidDevice.java
@@ -1,21 +1,32 @@
 package se.vidstige.jadb;
 
+import java.io.IOException;
+
 public class AndroidDevice {
 	private final String serial;
+	private Transport transport;
 	
-	public AndroidDevice(String serial, String type) {
+	AndroidDevice(String serial, String type, Transport transport) {
 		this.serial = serial;
+		this.transport = transport;
 	}	
 	
-	public AndroidDevice(String serial) {
-		this(serial, null);
-	}
-	
 	public String getSerial()
 	{
 		return serial;		
 	}
+
+	public String getStatus() throws IOException, JadbException {
+		transport.send(getPrefix() +  "get-state");
+		transport.verifyResponse();
+		return transport.readString();
+	}	
 	
+	private String getPrefix() {
+		//return "host-serial:" + serial + ":";
+		return "host-local:";
+	}
+
 	@Override
 	public String toString()
 	{
@@ -46,5 +57,4 @@ public class AndroidDevice {
 			return false;
 		return true;
 	}
-	
 }
diff --git a/src/se/vidstige/jadb/JadbConnection.java b/src/se/vidstige/jadb/JadbConnection.java
index 9d47a28..a2dbec2 100644
--- a/src/se/vidstige/jadb/JadbConnection.java
+++ b/src/se/vidstige/jadb/JadbConnection.java
@@ -43,7 +43,7 @@ public class JadbConnection {
 		for (String line : lines)
 		{
 			String[] parts = line.split("\t");
-			devices.add(new AndroidDevice(parts[0], parts[1]));
+			devices.add(new AndroidDevice(parts[0], parts[1], transport));
 		}
 		return devices;
 	}
diff --git a/test/se/vidstige/jadb/test/AndroidDeviceTestCases.java b/test/se/vidstige/jadb/test/AndroidDeviceTestCases.java
new file mode 100644
index 0000000..c3a7257
--- /dev/null
+++ b/test/se/vidstige/jadb/test/AndroidDeviceTestCases.java
@@ -0,0 +1,19 @@
+package se.vidstige.jadb.test;
+
+import java.util.List;
+
+import org.junit.Test;
+
+import se.vidstige.jadb.AndroidDevice;
+import se.vidstige.jadb.JadbConnection;
+
+public class AndroidDeviceTestCases {
+
+	@Test
+	public void test() throws Exception {
+		JadbConnection jadb = new JadbConnection();
+		List<AndroidDevice> devices = jadb.getDevices();
+		AndroidDevice device = devices.get(0);
+		device.getStatus();		
+	}
+}
diff --git a/test/se/vidstige/jadb/test/JadbTestCases.java b/test/se/vidstige/jadb/test/JadbTestCases.java
index d1997d4..14fbc9f 100644
--- a/test/se/vidstige/jadb/test/JadbTestCases.java
+++ b/test/se/vidstige/jadb/test/JadbTestCases.java
@@ -21,7 +21,6 @@ public class JadbTestCases {
 	{
 		JadbConnection jadb = new JadbConnection();
 		List<AndroidDevice> actual = jadb.getDevices();
-		AndroidDevice[] expected = { new AndroidDevice("emulator-5554") };
-		Assert.assertArrayEquals(expected, actual.toArray());
+		Assert.assertEquals("emulator-5554", actual.get(0).getSerial());
 	}
 }