diff --git a/src/androidTest/java/com/nutomic/syncthingandroid/test/util/FoldersAdapterTest.java b/src/androidTest/java/com/nutomic/syncthingandroid/test/util/FoldersAdapterTest.java
index 337a6279..143559a8 100644
--- a/src/androidTest/java/com/nutomic/syncthingandroid/test/util/FoldersAdapterTest.java
+++ b/src/androidTest/java/com/nutomic/syncthingandroid/test/util/FoldersAdapterTest.java
@@ -32,9 +32,10 @@ public class FoldersAdapterTest extends AndroidTestCase {
         mFolder.ReadOnly = false;
         mFolder.Versioning = new RestApi.Versioning();
 
+        mModel.state = "idle";
         mModel.localFiles = 50;
         mModel.globalFiles = 500;
-        mModel.localBytes = 1048576;
+        mModel.inSyncBytes = 1048576;
         mModel.globalBytes = 1073741824;
     }
 
@@ -57,8 +58,8 @@ public class FoldersAdapterTest extends AndroidTestCase {
         assertTrue(items.contains(Long.toString(mModel.localFiles)));
         assertTrue(items.contains(Long.toString(mModel.localFiles)));
         String size = ((TextView) v.findViewById(R.id.size)).getText().toString();
-        assertTrue(size.contains("1 MB"));
-        assertTrue(size.contains("1 GB"));
+        assertTrue(size.contains("1 MiB"));
+        assertTrue(size.contains("1 GiB"));
     }
 
 }
diff --git a/src/main/java/com/nutomic/syncthingandroid/syncthing/RestApi.java b/src/main/java/com/nutomic/syncthingandroid/syncthing/RestApi.java
index 3887a493..d3f2eae2 100644
--- a/src/main/java/com/nutomic/syncthingandroid/syncthing/RestApi.java
+++ b/src/main/java/com/nutomic/syncthingandroid/syncthing/RestApi.java
@@ -511,7 +511,7 @@ public class RestApi implements SyncthingService.OnWebGuiAvailableListener,
     }
 
     /**
-     * Converts a number of bytes to a human readable file size (eg 3.5 GB).
+     * Converts a number of bytes to a human readable file size (eg 3.5 GiB).
      */
     public static String readableFileSize(Context context, long bytes) {
         final String[] units = context.getResources().getStringArray(R.array.file_size_units);