Index: src/libchcore/Tests/TSimpleOrderedBufferQueueTests.cpp
===================================================================
diff -u -N -rda7737de7046ba0ecd255240fb36b4a46584ebf2 -rc4cbf6cd567821f9a981586ab5d8294a26f873be
--- src/libchcore/Tests/TSimpleOrderedBufferQueueTests.cpp	(.../TSimpleOrderedBufferQueueTests.cpp)	(revision da7737de7046ba0ecd255240fb36b4a46584ebf2)
+++ src/libchcore/Tests/TSimpleOrderedBufferQueueTests.cpp	(.../TSimpleOrderedBufferQueueTests.cpp)	(revision c4cbf6cd567821f9a981586ab5d8294a26f873be)
@@ -7,7 +7,7 @@
 using namespace chcore;
 
 // no expected position mode
-TEST(TSimpleOrderedBufferQueueTests, NoExpectedPos_ConstructionSanityTest)
+TEST(TSimpleOrderedBufferQueueTests, ConstructionSanityTest)
 {
 	TSimpleOrderedBufferQueue queue;
 
@@ -16,7 +16,7 @@
 	EXPECT_EQ(nullptr, queue.Peek());
 }
 
-TEST(TSimpleOrderedBufferQueueTests, NoExpectedPos_Push)
+TEST(TSimpleOrderedBufferQueueTests, Push)
 {
 	TSimpleOrderedBufferQueue queue;
 	TOverlappedDataBuffer buffer(1024, nullptr);
@@ -28,20 +28,29 @@
 	EXPECT_EQ(&buffer, queue.Peek());
 }
 
-TEST(TSimpleOrderedBufferQueueTests, NoExpectedPos_Pop)
+TEST(TSimpleOrderedBufferQueueTests, PushDuplicate)
 {
 	TSimpleOrderedBufferQueue queue;
 	TOverlappedDataBuffer buffer(1024, nullptr);
 
 	queue.Push(&buffer);
+	EXPECT_THROW(queue.Push(&buffer), TCoreException);
+}
+
+TEST(TSimpleOrderedBufferQueueTests, Pop)
+{
+	TSimpleOrderedBufferQueue queue;
+	TOverlappedDataBuffer buffer(1024, nullptr);
+
+	queue.Push(&buffer);
 	EXPECT_EQ(&buffer, queue.Pop());
 
 	EXPECT_EQ(0, queue.size());
 	EXPECT_EQ(true, queue.empty());
 	EXPECT_EQ(nullptr, queue.Peek());
 }
 
-TEST(TSimpleOrderedBufferQueueTests, NoExpectedPos_Clear)
+TEST(TSimpleOrderedBufferQueueTests, Clear)
 {
 	TSimpleOrderedBufferQueue queue;
 	TOverlappedDataBuffer buffer(1024, nullptr);
@@ -54,7 +63,7 @@
 	EXPECT_EQ(nullptr, queue.Peek());
 }
 
-TEST(TSimpleOrderedBufferQueueTests, NoExpectedPos_ReleaseBuffers)
+TEST(TSimpleOrderedBufferQueueTests, ReleaseBuffers)
 {
 	TSimpleOrderedBufferQueue queue;
 	TBufferListPtr spReleaseList(std::make_shared<TBufferList>());