diff --git a/GSoC2013Ideas.wiki b/GSoC2013Ideas.wiki
index 18ab701..708e913 100644
--- a/GSoC2013Ideas.wiki
+++ b/GSoC2013Ideas.wiki
@@ -40,13 +40,36 @@
 
 *Probable Mentor:* Mario Ferraro (Merio on #melange)
 
-== Functional Tests ==
+== Functional Tests Focusing on Behavior-Driven Development ==
 
-Functional tests verify the complete and fully integrated functioning of the entire Melange system and are phrased in approachable language stated in terms of user experience. Melange has far too few.
+Following last few years' successful GSoC projects on testing, our focus is mainly on behavior-driven development (BDD) this year. Although Melange is already a relatively mature project, such a technique is still useful to us. First, the biggest obstacles for writing tests is the drudgery taken to write one, so people just don't bother to do so, though they clearly know the importance of testing. The xunit testing framework pioneered by Kent Beck and Erich Gamma has made writing tests much easier. BDD, in my opinion, is another step to reduce the barrier by allowing people to write test cases in a natural language like manner. Second, the natural language like syntax also opens the door for non programmers to write test cases. In the context of Melange, they may include program hosts and other users. Last but not least, when a user requests a new feature, they can use the Domain-specific language (DSL) to describe their needs more accurately, which will also serve as a contract/test cases for development. Thus, it is only needed to be written once but can be used in multiple stages of the project life cycle and also a win-win for both users and developers.
 
-*Relevant Skills:* Python, HTML, Bash
+The purpose of this project is to build a good infrastructure on BDD for Melange including defining customised DSL and to write test cases for existing functions/features. Pyccuracy is the recommended framework thanks to its good integration with Selenium and out-of-box DSL for web testing. We are, however, also open to other alternatives, such as Behave and Lettuce. In addition, other proposals on testing are also welcome.
 
-*Probable Mentor:* Chong Liu
+To get started with Melange, you may find the following wikis useful:
+https://code.google.com/p/soc/wiki/GettingStarted
+https://code.google.com/p/soc/wiki/2013DeveloperDoc
+https://code.google.com/p/soc/wiki/PythonStyleGuide
+
+To get started with Melange testing, you may find the following wikis useful:
+https://code.google.com/p/soc/wiki/GettingStartedOnTesting
+https://code.google.com/p/soc/wiki/TestingGuidelines
+
+To make you become familiar with the Melange code base and demonstrate your ability and enthusiasm, you are recommended to read our issue tracker, find a couple of ones you are interested, and then try to tackle them. Alternatively, you can also write some functional tests for Melange.
+https://code.google.com/p/soc/issues/list
+
+The code of Melange are structured in the following way:
+* The main code is in app/soc.
+* The tests are in tests.
+* Unit tests are organized in the way similar to the main code.
+* The test utils are tests/*_utils.py
+* The existing functional testing infrastructures and tests written by Syed are in the functional_testing branch.
+
+If you have questions not answered here or other wiki pages, please feel free to ask on the mailing list melange-soc-dev@googlegroups.com.
+
+*Relevant Skills:* Python, BDD, Selenium
+
+*Probable Mentor:* Chong Liu (Leo)
 
 == Enhanced Registration Workflow ==