diff --git a/MyTracksTest/.classpath b/MyTracksTest/.classpath
index e7b9e07b8..ac429b1c3 100644
--- a/MyTracksTest/.classpath
+++ b/MyTracksTest/.classpath
@@ -3,12 +3,12 @@
 	<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/AndroidMockRuntime.jar"/>
 	<classpathentry kind="src" path=".apt_generated">
 		<attributes>
 			<attribute name="optional" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry combineaccessrules="false" kind="src" path="/MyTracks"/>
+	<classpathentry kind="lib" path="libs/AndroidMockGenerator.jar"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>
diff --git a/MyTracksTest/.factorypath b/MyTracksTest/.factorypath
index 75ad648ce..5eaac6ca6 100644
--- a/MyTracksTest/.factorypath
+++ b/MyTracksTest/.factorypath
@@ -1,6 +1,7 @@
 <factorypath>
     <factorypathentry kind="WKSPJAR" id="/MyTracksTest/libs/AndroidMockGenerator.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="ANDROID_SDK/platforms/android-13/android.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="ANDROID_SDK/add-ons/addon_google_apis_google_inc_13/libs/maps.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="MYTRACKS_BIN" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="ANDROID_SDK/platforms/android-14/android.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="ANDROID_SDK/add-ons/addon-google_apis-google_inc_-14/libs/maps.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="WKSPJAR" id="/MyTracksLib/bin/mytrackslib.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="MYTRACKS_BIN/classes" 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
index ac3541cd4..527bacd02 100644
--- a/MyTracksTest/.settings/org.eclipse.jdt.apt.core.prefs
+++ b/MyTracksTest/.settings/org.eclipse.jdt.apt.core.prefs
@@ -1,7 +1,7 @@
-#Mon Nov 01 02:42:03 BRST 2010
+#Tue Oct 25 14:08:44 PDT 2011
 eclipse.preferences.version=1
 org.eclipse.jdt.apt.aptEnabled=true
 org.eclipse.jdt.apt.genSrcDir=.apt_generated
-org.eclipse.jdt.apt.processorOptions/bin_dir=%PROJECT.DIR%/bin
-org.eclipse.jdt.apt.processorOptions/logfile=%PROJECT.DIR%/annotations.log
+org.eclipse.jdt.apt.processorOptions/bin_dir=%PROJECT.DIR%/bin/classes
+org.eclipse.jdt.apt.processorOptions/logfile=%PROJECT.DIR%/AnnotationProcessor.log
 org.eclipse.jdt.apt.reconcileEnabled=false
diff --git a/SignalStrengthSamplerTest/.classpath b/SignalStrengthSamplerTest/.classpath
index ea6042d8c..1af117a86 100644
--- a/SignalStrengthSamplerTest/.classpath
+++ b/SignalStrengthSamplerTest/.classpath
@@ -3,7 +3,7 @@
 	<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/AndroidMockRuntime.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/SignalStrengthSampler"/>
+	<classpathentry kind="lib" path="libs/AndroidMockGenerator.jar"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>
diff --git a/SignalStrengthSamplerTest/libs/AndroidMockGenerator.jar b/SignalStrengthSamplerTest/libs/AndroidMockGenerator.jar
new file mode 100644
index 000000000..ef8b3612c
Binary files /dev/null and b/SignalStrengthSamplerTest/libs/AndroidMockGenerator.jar differ