diff --git a/src/tests/kits/support/bstring/StringAccessTest.cpp b/src/tests/kits/support/bstring/StringAccessTest.cpp
new file mode 100644
index 0000000000..e3b9ab809c
--- /dev/null
+++ b/src/tests/kits/support/bstring/StringAccessTest.cpp
@@ -0,0 +1,55 @@
+#include "StringAccessTest.h"
+#include "cppunit/TestCaller.h"
+#include <String.h>
+#include <UTF8.h>
+
+StringAccessTest::StringAccessTest(std::string name) :
+		BTestCase(name)
+{
+}
+
+ 
+
+StringAccessTest::~StringAccessTest()
+{
+}
+
+
+void 
+StringAccessTest::PerformTest(void)
+{
+	//CountChars(), Length(), String()
+	NextSubTest();
+	BString string("Something"B_UTF8_ELLIPSIS);
+	CPPUNIT_ASSERT(string.CountChars() == 10);
+	CPPUNIT_ASSERT(string.Length() == strlen(string.String());
+
+	NextSubTest();
+	BString string2("ABCD");
+	CPPUNIT_ASSERT(string2.CountChars() == 4);
+	CPPUNIT_ASSERT(string2.Length() == strlen(string2.String());
+
+	NextSubTest();
+	static char s[64];
+	strcpy(s, B_UTF8_ELLIPSIS);
+	strcat(s, B_UTF8_SMILING_FACE);
+	BString string3(s);
+	CPPUNIT_ASSERT(string3.CountChars() == 2);	
+	CPPUNIT_ASSERT(string3.Length() == strlen(string3.String());
+
+	NextSubTest();
+	BString empty;
+	CPPUNIT_ASSERT(empty.String() == NULL);
+	CPPUNIT_ASSERT(empty.Length() == 0);
+	CPPUNIT_ASSERT(empty.CountChars() == 0);
+
+}
+
+
+CppUnit::Test *StringAccessTest::suite(void)
+{	
+	typedef CppUnit::TestCaller<StringAccessTest>
+		StringAccessTestCaller;
+		
+	return(new StringAccessTestCaller("BString::Access Test", &StringAccessTest::PerformTest));
+}
diff --git a/src/tests/kits/support/bstring/StringAccessTest.h b/src/tests/kits/support/bstring/StringAccessTest.h
new file mode 100644
index 0000000000..41a142c12e
--- /dev/null
+++ b/src/tests/kits/support/bstring/StringAccessTest.h
@@ -0,0 +1,22 @@
+#ifndef StringAccessTest_H
+#define StringAccessTest_H
+
+#include "TestCase.h"
+#include <String.h>
+
+	
+class StringAccessTest : public BTestCase
+{
+	
+private:
+	
+protected:
+	
+public:
+	static Test *suite(void);
+	void PerformTest(void);
+	StringAccessTest(std::string name = "");
+	virtual ~StringAccessTest();
+	};
+	
+#endif
diff --git a/src/tests/kits/support/bstring/StringCountCharTest.cpp b/src/tests/kits/support/bstring/StringCountCharTest.cpp
deleted file mode 100644
index c768973e2f..0000000000
--- a/src/tests/kits/support/bstring/StringCountCharTest.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-#include "StringCountCharTest.h"
-#include "cppunit/TestCaller.h"
-#include <String.h>
-#include <UTF8.h>
-
-StringCountCharTest::StringCountCharTest(std::string name) :
-		BTestCase(name)
-{
-}
-
- 
-
-StringCountCharTest::~StringCountCharTest()
-{
-}
-
-
-void 
-StringCountCharTest::PerformTest(void)
-{
-	//CountChars()
-	NextSubTest();
-	BString string("Something"B_UTF8_ELLIPSIS);
-	CPPUNIT_ASSERT(string.CountChars() == 10);
-	
-	NextSubTest();
-	BString string2("ABCD");
-	CPPUNIT_ASSERT(string2.CountChars() == 4);
-	
-	NextSubTest();
-	static char s[64];
-	strcpy(s, B_UTF8_ELLIPSIS);
-	strcat(s, B_UTF8_SMILING_FACE);
-	BString string3(s);
-	CPPUNIT_ASSERT(string3.CountChars() == 2);	
-}
-
-
-CppUnit::Test *StringCountCharTest::suite(void)
-{	
-	typedef CppUnit::TestCaller<StringCountCharTest>
-		StringCountCharTestCaller;
-		
-	return(new StringCountCharTestCaller("BString::CountChar Test", &StringCountCharTest::PerformTest));
-}
diff --git a/src/tests/kits/support/bstring/StringCountCharTest.h b/src/tests/kits/support/bstring/StringCountCharTest.h
deleted file mode 100644
index 6199195df1..0000000000
--- a/src/tests/kits/support/bstring/StringCountCharTest.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef StringCountCharTest_H
-#define StringCountCharTest_H
-
-#include "TestCase.h"
-#include <String.h>
-
-	
-class StringCountCharTest : public BTestCase
-{
-	
-private:
-	
-protected:
-	
-public:
-	static Test *suite(void);
-	void PerformTest(void);
-	StringCountCharTest(std::string name = "");
-	virtual ~StringCountCharTest();
-	};
-	
-#endif
diff --git a/src/tests/kits/support/bstring/StringTest.cpp b/src/tests/kits/support/bstring/StringTest.cpp
index 5153b6077b..52452b4408 100644
--- a/src/tests/kits/support/bstring/StringTest.cpp
+++ b/src/tests/kits/support/bstring/StringTest.cpp
@@ -2,7 +2,7 @@
 #include "cppunit/TestSuite.h"
 #include "StringTest.h"
 #include "StringConstructionTest.h"
-#include "StringCountCharTest.h"
+#include "StringAccessTest.h"
 #include "StringAssignTest.h"
 #include "StringAppendTest.h"
 #include "StringSubCopyTest.h"
@@ -22,7 +22,7 @@ CppUnit::Test *StringTestSuite()
 	CppUnit::TestSuite *testSuite = new CppUnit::TestSuite();
 	
 	testSuite->addTest(StringConstructionTest::suite());
-	testSuite->addTest(StringCountCharTest::suite());
+	testSuite->addTest(StringAccessTest::suite());
 	testSuite->addTest(StringAssignTest::suite());
 	testSuite->addTest(StringAppendTest::suite());
 	testSuite->addTest(StringSubCopyTest::suite());