diff --git a/src/kernel/curse.test.c b/src/kernel/curse.test.c
index 8737c2587..7f8bb4db2 100644
--- a/src/kernel/curse.test.c
+++ b/src/kernel/curse.test.c
@@ -101,13 +101,7 @@ static void test_memstream(CuTest *tc) {
     char buf[1024];
     int val=0;
 
-#ifdef FILESTREAMTEST
-    FILE *F;
-    F = fopen("test.dat", "wb");
-    fstream_init(&out, F);
-#else
     mstream_init(&out);
-#endif
     binstore_init(&store, &out);
     store.handle.data = &out;
 
@@ -115,11 +109,6 @@ static void test_memstream(CuTest *tc) {
     WRITE_TOK(&store, "fortytwo");
     WRITE_INT(&store, 42);
 
-#ifdef FILESTREAMTEST
-    fstream_done(&out);
-    F = fopen("test.dat", "rb");
-    fstream_init(&out, F);
-#endif
     out.api->rewind(out.handle);
     READ_INT(&store, &val);
     READ_TOK(&store, buf, 1024);
@@ -127,6 +116,7 @@ static void test_memstream(CuTest *tc) {
     CuAssertStrEquals(tc, "fortytwo", buf);
     READ_INT(&store, &val);
     CuAssertIntEquals(tc, 42, val);
+    mstream_done(&out);
 }
 
 static void test_write_flag(CuTest *tc) {
@@ -135,24 +125,14 @@ static void test_write_flag(CuTest *tc) {
     char buf[1024];
     stream out = { 0 };
     size_t len;
-#ifdef FILESTREAMTEST
-    FILE *F;
-    F = fopen("test.dat", "wb");
-    fstream_init(&out, F);
-#else
+
     mstream_init(&out);
-#endif
     binstore_init(&store, &out);
     store.handle.data = &out;
 
     setup_curse(&fix, "gbdream");
     fix.c->flags = 42 | CURSE_ISNEW;
     curse_write(fix.r->attribs, fix.r, &store);
-#ifdef FILESTREAMTEST
-    fstream_done(&out);
-    F = fopen("test.dat", "rb");
-    fstream_init(&out, F);
-#endif
     out.api->rewind(out.handle);
     len = out.api->read(out.handle, buf, sizeof(buf));
     buf[len] = '\0';
@@ -162,11 +142,7 @@ static void test_write_flag(CuTest *tc) {
     global.data_version = RELEASE_VERSION;
     CuAssertIntEquals(tc, RELEASE_VERSION, global.data_version);
 
-#ifdef FILESTREAMTEST
-    fstream_done(&out);
-#else
     mstream_done(&out);
-#endif
     binstore_done(&store);
     test_cleanup();
 }
diff --git a/src/util/bsdstring.c b/src/util/bsdstring.c
index c43847da1..652608483 100644
--- a/src/util/bsdstring.c
+++ b/src/util/bsdstring.c
@@ -12,10 +12,6 @@ int wrptr(char **ptr, size_t * size, size_t bytes)
     if (bytes == 0) {
         return 0;
     }
-    if (bytes < 0) {
-        *size = 0;
-        return EINVAL;
-    }
     if (bytes <= *size) {
         *ptr += bytes;
         *size -= bytes;
diff --git a/storage b/storage
index 48768e4be..2bcd3b1e6 160000
--- a/storage
+++ b/storage
@@ -1 +1 @@
-Subproject commit 48768e4bef7ff28365487e047d3b910127c716d0
+Subproject commit 2bcd3b1e64764321773672333bd133a61b35b840