diff --git a/src/test/java/org/gaul/s3proxy/S3ProxyTest.java b/src/test/java/org/gaul/s3proxy/S3ProxyTest.java
index 65af6f8..9c18648 100644
--- a/src/test/java/org/gaul/s3proxy/S3ProxyTest.java
+++ b/src/test/java/org/gaul/s3proxy/S3ProxyTest.java
@@ -481,9 +481,6 @@ public final class S3ProxyTest {
 
         for (int i = 0; i < numParts; ++i) {
             ByteSource partByteSource = byteSource.slice(i, 1);
-            // TODO: wrap sliced byte source to work around zero length bug
-            partByteSource = ByteSource.wrap(partByteSource.read());
-            assertThat(partByteSource.size()).isEqualTo(1);  // TODO:
             Payload payload = Payloads.newByteSourcePayload(partByteSource);
             payload.getContentMetadata().setContentLength(
                     partByteSource.size());
diff --git a/src/test/java/org/gaul/s3proxy/TestUtils.java b/src/test/java/org/gaul/s3proxy/TestUtils.java
index f711915..ce72abf 100644
--- a/src/test/java/org/gaul/s3proxy/TestUtils.java
+++ b/src/test/java/org/gaul/s3proxy/TestUtils.java
@@ -75,7 +75,8 @@ final class TestUtils {
             if (closed) {
                 throw new IOException("Stream already closed");
             }
-            return (byte) random.nextInt();
+            // return value between 0 and 255
+            return random.nextInt() & 0xff;
         }
 
         @Override