diff --git a/astrid/.classpath b/astrid/.classpath
index fe7a86e7a..7485dd131 100644
--- a/astrid/.classpath
+++ b/astrid/.classpath
@@ -26,8 +26,8 @@
 	<classpathentry exported="true" kind="lib" path="libs/google-oauth-client-extensions-1.5.0-beta.jar"/>
 	<classpathentry exported="true" kind="lib" path="libs/gson-1.6.jar"/>
 	<classpathentry exported="true" kind="lib" path="libs/google-api-services-tasks-v1-1.2.5-beta.jar"/>
-	<classpathentry kind="lib" path="libs/crittercism_v1_2_5.jar"/>
-	<classpathentry kind="lib" path="libs/jchronic-0.2.3.jar"/>
-	<classpathentry kind="lib" path="libs/guava-11.0.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/crittercism_v1_2_5.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/jchronic-0.2.3.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/guava-11.0.1.jar"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>
diff --git a/tests/.classpath b/tests/.classpath
index bf2584e47..235ca48e1 100644
--- a/tests/.classpath
+++ b/tests/.classpath
@@ -5,8 +5,5 @@
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/astrid"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/astridApi"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/facebook"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/GreenDroid"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>
diff --git a/tests/.project b/tests/.project
index 4e205d948..68bd361f5 100644
--- a/tests/.project
+++ b/tests/.project
@@ -3,6 +3,7 @@
 	<name>astrid-tests</name>
 	<comment></comment>
 	<projects>
+		<project>astrid</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>
diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml
index 6751fdd32..06c7c7631 100644
--- a/tests/AndroidManifest.xml
+++ b/tests/AndroidManifest.xml
@@ -5,7 +5,7 @@
           android:versionCode="1"
           android:versionName="1.0">
           
-    <uses-sdk android:minSdkVersion="3" />
+    <uses-sdk android:minSdkVersion="7" />
       
     <!-- We add an application tag here just so that we can indicate that
          this package needs to link against the android.test library,
diff --git a/tests/project.properties b/tests/project.properties
index 0ae0e5e97..9971607fc 100644
--- a/tests/project.properties
+++ b/tests/project.properties
@@ -7,8 +7,6 @@
 # "ant.properties", and override values to adapt the script to your
 # project structure.
 
-# Indicates whether an apk should be generated for each density.
-split.density=false
 # Project target.
 target=android-14
-android.library.reference.1=../api/
+android.library.reference.1=../api
diff --git a/tests/src/com/todoroo/astrid/reminders/NotificationTests.java b/tests/src/com/todoroo/astrid/reminders/NotificationTests.java
index 724dd0b90..be35b2a7c 100644
--- a/tests/src/com/todoroo/astrid/reminders/NotificationTests.java
+++ b/tests/src/com/todoroo/astrid/reminders/NotificationTests.java
@@ -47,7 +47,7 @@ public class NotificationTests extends DatabaseTestCase {
 
         Intent intent = new Intent();
         intent.putExtra(Notifications.ID_KEY, task.getId());
-        intent.putExtra(Notifications.TYPE_KEY, ReminderService.TYPE_DUE);
+        intent.putExtra(Notifications.EXTRAS_TYPE, ReminderService.TYPE_DUE);
         new Notifications().onReceive(getContext(), intent);
         assertTrue(triggered.value);
     }
@@ -77,7 +77,7 @@ public class NotificationTests extends DatabaseTestCase {
 
         Intent intent = new Intent();
         intent.putExtra(Notifications.ID_KEY, task.getId());
-        intent.putExtra(Notifications.TYPE_KEY, ReminderService.TYPE_DUE);
+        intent.putExtra(Notifications.EXTRAS_TYPE, ReminderService.TYPE_DUE);
         new Notifications().onReceive(getContext(), intent);
     }
 
@@ -106,7 +106,7 @@ public class NotificationTests extends DatabaseTestCase {
 
         Intent intent = new Intent();
         intent.putExtra(Notifications.ID_KEY, task.getId());
-        intent.putExtra(Notifications.TYPE_KEY, ReminderService.TYPE_DUE);
+        intent.putExtra(Notifications.EXTRAS_TYPE, ReminderService.TYPE_DUE);
         new Notifications().onReceive(getContext(), intent);
     }
 
@@ -131,7 +131,7 @@ public class NotificationTests extends DatabaseTestCase {
                 assertTrue(notification.vibrate.length > 0);
             }
         });
-        intent.putExtra(Notifications.TYPE_KEY, ReminderService.TYPE_DUE);
+        intent.putExtra(Notifications.EXTRAS_TYPE, ReminderService.TYPE_DUE);
         new Notifications().onReceive(getContext(), intent);
 
         // random notification does not
@@ -143,8 +143,8 @@ public class NotificationTests extends DatabaseTestCase {
                         notification.vibrate.length == 0);
             }
         });
-        intent.removeExtra(Notifications.TYPE_KEY);
-        intent.putExtra(Notifications.TYPE_KEY, ReminderService.TYPE_RANDOM);
+        intent.removeExtra(Notifications.EXTRAS_TYPE);
+        intent.putExtra(Notifications.EXTRAS_TYPE, ReminderService.TYPE_RANDOM);
         new Notifications().onReceive(getContext(), intent);
 
         // wrapping works
@@ -157,8 +157,8 @@ public class NotificationTests extends DatabaseTestCase {
                 assertTrue((notification.defaults & Notification.DEFAULT_SOUND) == 0);
             }
         });
-        intent.removeExtra(Notifications.TYPE_KEY);
-        intent.putExtra(Notifications.TYPE_KEY, ReminderService.TYPE_DUE);
+        intent.removeExtra(Notifications.EXTRAS_TYPE);
+        intent.putExtra(Notifications.EXTRAS_TYPE, ReminderService.TYPE_DUE);
         new Notifications().onReceive(getContext(), intent);
 
         // nonstop notification still sounds