diff --git a/app/src/androidTest/java/at/bitfire/davdroid/resource/LocalCalendarTest.java b/app/src/androidTest/java/at/bitfire/davdroid/resource/LocalCalendarTest.java
index 28249209..81c56656 100644
--- a/app/src/androidTest/java/at/bitfire/davdroid/resource/LocalCalendarTest.java
+++ b/app/src/androidTest/java/at/bitfire/davdroid/resource/LocalCalendarTest.java
@@ -33,7 +33,7 @@ import at.bitfire.davdroid.resource.LocalStorageException;
 public class LocalCalendarTest extends InstrumentationTestCase {
 	
 	private static final String
-		TAG = "davroid.LocalCalendarTest",
+		TAG = "davroid.test",
 		calendarName = "DAVdroid_Test";
 	
 	ContentProviderClient providerClient;
@@ -76,13 +76,13 @@ public class LocalCalendarTest extends InstrumentationTestCase {
 		providerClient = resolver.acquireContentProviderClient(CalendarContract.AUTHORITY);
 		
 		long id;
-		
+
 		@Cleanup Cursor cursor = providerClient.query(Calendars.CONTENT_URI,
-				new String[] { Calendars._ID },
+				new String[]{Calendars._ID},
 				Calendars.ACCOUNT_TYPE + "=? AND " + Calendars.NAME + "=?",
-				new String[] { CalendarContract.ACCOUNT_TYPE_LOCAL, calendarName },
+				new String[]{ CalendarContract.ACCOUNT_TYPE_LOCAL, calendarName },
 				null);
-		if (cursor.moveToNext()) {
+		if (cursor != null && cursor.moveToNext()) {
 			// found local test calendar
 			id = cursor.getLong(0);
 			Log.d(TAG, "Found test calendar with ID " + id);
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c2e99059..9ae04405 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -113,6 +113,7 @@
 
     <string name="login_password">Password:</string>
 
+    <!-- Settings activity -->
     <string name="settings_title">Settings</string>
     <string name="settings_no_accounts">No DAVdroid accounts found</string>
     <string name="settings_authentication">Authentication</string>
diff --git a/app/src/main/res/xml/sync_prefs.xml b/app/src/main/res/xml/sync_prefs.xml
index 707ec8f0..5c1aa923 100644
--- a/app/src/main/res/xml/sync_prefs.xml
+++ b/app/src/main/res/xml/sync_prefs.xml
@@ -9,10 +9,10 @@
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" >
     
-    <PreferenceScreen android:title="@string/settings_title" >
+    <PreferenceScreen android:title="@string/settings_title">
         <intent
             android:targetPackage="at.bitfire.davdroid"
-            android:targetClass="at.bitfire.davdroid.syncadapter.SettingsActivity"
+            android:targetClass="at.bitfire.davdroid.ui.settings.SettingsActivity"
             android:action="ACTION_VIEW" />
     </PreferenceScreen>