diff --git a/lib/rb/spec/socket_spec.rb b/lib/rb/spec/socket_spec.rb
index 5406453..b6e2a14 100644
--- a/lib/rb/spec/socket_spec.rb
+++ b/lib/rb/spec/socket_spec.rb
@@ -29,9 +29,9 @@
       TCPSocket.should_receive(:new).and_return(@handle)
       @socket.open
       @socket.should be_open
-      @socket.set_handle nil
+      @socket.handle = nil
       @socket.should_not be_open
-      @socket.set_handle @handle
+      @socket.handle = @handle
       @handle.should_receive(:close)
       @socket.close
       @socket.should_not be_open
@@ -85,8 +85,8 @@
     end
 
     it "should create a handle when calling listen" do
-      TCPServer.should_receive(:new).with(nil, 1234)
       @socket.listen
+      @socket.handle.should be_an_instance_of(TCPServer)
     end
 
     it "should create a Thrift::Socket to wrap accepted sockets" do
@@ -97,7 +97,7 @@
       handle.should_receive(:accept).and_return(sock)
       trans = mock("Socket")
       Socket.should_receive(:new).and_return(trans)
-      trans.should_receive(:set_handle).with(sock)
+      trans.should_receive(:handle=).with(sock)
       @socket.accept.should == trans
     end
 
diff --git a/lib/rb/spec/transport_spec.rb b/lib/rb/spec/transport_spec.rb
index 941df28..5d5c92f 100644
--- a/lib/rb/spec/transport_spec.rb
+++ b/lib/rb/spec/transport_spec.rb
@@ -26,6 +26,10 @@
         Transport.method_defined?(sym).should be_true
       end
     end
+
+    it "should alias << to write" do
+      Transport.instance_method(:<<).should == Transport.instance_method(:write)
+    end
   end
 
   describe ServerTransport do
@@ -208,6 +212,13 @@
       @buffer = MemoryBuffer.new
     end
 
+    it "should accept a buffer on input and use it directly" do
+      s = "this is a test"
+      @buffer = MemoryBuffer.new(s)
+      @buffer.read(4).should == "this"
+      s.should == " is a test"
+    end
+
     it "should always remain open" do
       @buffer.should be_open
       @buffer.close
@@ -235,6 +246,15 @@
       @buffer.available.should == 0
     end
 
+    it "should copy the given string whne resetting the buffer" do
+      s = "this is a test"
+      @buffer.reset_buffer(s)
+      @buffer.available.should == 14
+      @buffer.read(10)
+      @buffer.available.should == 4
+      s.should == "this is a test"
+    end
+
     it "should return from read what was given in write" do
       @buffer.write "test data"
       @buffer.read(4).should == "test"