diff --git a/MyTracks/.settings/org.eclipse.jdt.core.prefs b/MyTracks/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 000000000..dec15e80b
--- /dev/null
+++ b/MyTracks/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,12 @@
+#Thu Aug 12 18:54:52 BRT 2010
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/MyTracks/default.properties b/MyTracks/default.properties
index 089c57d48..c4fb0851b 100644
--- a/MyTracks/default.properties
+++ b/MyTracks/default.properties
@@ -10,4 +10,4 @@
 # Indicates whether an apk should be generated for each density.
 split.density=false
 # Project target.
-target=Google Inc.:Google APIs:7
+target=Google Inc.:Google APIs:8
diff --git a/MyTracksTest/.classpath b/MyTracksTest/.classpath
index f8a6020f2..7ec6a9bf6 100644
--- a/MyTracksTest/.classpath
+++ b/MyTracksTest/.classpath
@@ -4,6 +4,11 @@
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="gen"/>
-	<classpathentry kind="lib" path="libs/easymock.jar"/>
+	<classpathentry kind="lib" path="libs/AndroidMockRuntime.jar"/>
+	<classpathentry kind="src" path=".apt_generated">
+		<attributes>
+			<attribute name="optional" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/MyTracksTest/.factorypath b/MyTracksTest/.factorypath
new file mode 100644
index 000000000..25bd193ed
--- /dev/null
+++ b/MyTracksTest/.factorypath
@@ -0,0 +1,4 @@
+<factorypath>
+    <factorypathentry kind="PLUGIN" id="org.eclipse.jst.ws.annotations.core" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="WKSPJAR" id="/MyTracksTest/libs/AndroidMockGenerator.jar" enabled="true" runInBatchMode="false"/>
+</factorypath>
diff --git a/MyTracksTest/.settings/org.eclipse.jdt.apt.core.prefs b/MyTracksTest/.settings/org.eclipse.jdt.apt.core.prefs
new file mode 100644
index 000000000..357ffd6b8
--- /dev/null
+++ b/MyTracksTest/.settings/org.eclipse.jdt.apt.core.prefs
@@ -0,0 +1,7 @@
+#Thu Aug 12 19:30:48 BRT 2010
+eclipse.preferences.version=1
+org.eclipse.jdt.apt.aptEnabled=true
+org.eclipse.jdt.apt.genSrcDir=.apt_generated
+org.eclipse.jdt.apt.processorOptions/bin_dir=MyTracksTest/bin
+org.eclipse.jdt.apt.processorOptions/logfile=MyTracksTest/annotations.log
+org.eclipse.jdt.apt.reconcileEnabled=false
diff --git a/MyTracksTest/.settings/org.eclipse.jdt.core.prefs b/MyTracksTest/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 000000000..1afc2a96c
--- /dev/null
+++ b/MyTracksTest/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,13 @@
+#Thu Aug 12 19:30:48 BRT 2010
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.processAnnotations=enabled
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/MyTracksTest/default.properties b/MyTracksTest/default.properties
index 5b3be86a8..c4fb0851b 100644
--- a/MyTracksTest/default.properties
+++ b/MyTracksTest/default.properties
@@ -10,4 +10,4 @@
 # Indicates whether an apk should be generated for each density.
 split.density=false
 # Project target.
-target=Google Inc.:Google APIs:4
+target=Google Inc.:Google APIs:8
diff --git a/MyTracksTest/lib/AndroidMockGenerator.jar b/MyTracksTest/libs/AndroidMockGenerator.jar
similarity index 100%
rename from MyTracksTest/lib/AndroidMockGenerator.jar
rename to MyTracksTest/libs/AndroidMockGenerator.jar
diff --git a/MyTracksTest/lib/AndroidMockRuntime.jar b/MyTracksTest/libs/AndroidMockRuntime.jar
similarity index 100%
rename from MyTracksTest/lib/AndroidMockRuntime.jar
rename to MyTracksTest/libs/AndroidMockRuntime.jar
diff --git a/MyTracksTest/libs/easymock.jar b/MyTracksTest/libs/easymock.jar
deleted file mode 100644
index de591680c..000000000
Binary files a/MyTracksTest/libs/easymock.jar and /dev/null differ