Index: src/libchcore/Tests/OverlappedCallbacksTests.cpp
===================================================================
diff -u -N -rbef894e38e5c1486824787cf8c47a87a0828b228 -rb941384e121190b6107f1c99b3233667e3daf4ce
--- src/libchcore/Tests/OverlappedCallbacksTests.cpp	(.../OverlappedCallbacksTests.cpp)	(revision bef894e38e5c1486824787cf8c47a87a0828b228)
+++ src/libchcore/Tests/OverlappedCallbacksTests.cpp	(.../OverlappedCallbacksTests.cpp)	(revision b941384e121190b6107f1c99b3233667e3daf4ce)
@@ -13,28 +13,27 @@
 	logger::TLogFileDataPtr spLogData(std::make_shared<logger::TLogFileData>());
 
 	TOverlappedMemoryPoolPtr spBuffers(std::make_shared<TOverlappedMemoryPool>());
-	TOverlappedReaderWriter queue(spLogData, spBuffers, 0, 4096);
+	TOverlappedReader queue(spLogData, spBuffers->GetBufferList(), 0, 4096);
 	TOverlappedDataBuffer buffer(16384, &queue);
 
 	buffer.InitForRead(0, 1024);
 	buffer.SetStatusCode(0);
 	buffer.SetBytesTransferred(234);
+	buffer.SetParam(&queue);
 
 	OverlappedReadCompleted(ERROR_SUCCESS, 234, &buffer);
 
 	EXPECT_TRUE(buffer.IsLastPart());
 	EXPECT_EQ(ERROR_SUCCESS, buffer.GetErrorCode());
 	EXPECT_EQ(234, buffer.GetRealDataSize());
-
-	EXPECT_EQ(queue.GetWriteBuffer(), &buffer);
 }
 
 TEST(OverlappedCallbackTests, OverlappedReadCompleted_Failure)
 {
 	logger::TLogFileDataPtr spLogData(std::make_shared<logger::TLogFileData>());
 
 	TOverlappedMemoryPoolPtr spBuffers(std::make_shared<TOverlappedMemoryPool>());
-	TOverlappedReaderWriter queue(spLogData, spBuffers, 0, 4096);
+	TOverlappedReader queue(spLogData, spBuffers->GetBufferList(), 0, 4096);
 	TOverlappedDataBuffer buffer(16384, &queue);
 
 	buffer.InitForRead(0, 1024);
@@ -55,7 +54,8 @@
 	logger::TLogFileDataPtr spLogData(std::make_shared<logger::TLogFileData>());
 
 	TOverlappedMemoryPoolPtr spBuffers(std::make_shared<TOverlappedMemoryPool>());
-	TOverlappedReaderWriter queue(spLogData, spBuffers, 0, 4096);
+	TOrderedBufferQueuePtr spBuffersToWrite(std::make_shared<TOrderedBufferQueue>(0));
+	TOverlappedWriter queue(spLogData, spBuffersToWrite, 0, spBuffers->GetBufferList());
 	TOverlappedDataBuffer buffer(16384, &queue);
 
 	buffer.InitForRead(0, 1024);
@@ -67,5 +67,5 @@
 	OverlappedWriteCompleted(ERROR_SUCCESS, 234, &buffer);
 
 	EXPECT_EQ(ERROR_SUCCESS, buffer.GetErrorCode());
-	EXPECT_EQ(queue.GetFinishedWriteBuffer(), &buffer);
+	EXPECT_EQ(queue.GetFinishedBuffer(), &buffer);
 }