From b0e8f26f5882388f9544fd2d15512adea0d089d9 Mon Sep 17 00:00:00 2001
From: Timothy Hsu <timothy.hsu@liferay.com>
Date: Mon, 21 May 2012 13:54:03 -0700
Subject: [PATCH] LPS-27360

---
 ...CategoryThreadMessageViewCountAPTests.html |   4 +-
 ...CategoryThreadMessageViewCountAPTests.java |   6 +-
 ...stractsMBCategoryThreadMessageAPTests.html |   4 +-
 ...stractsMBCategoryThreadMessageAPTests.java |   6 +-
 ...ailableMBCategoryThreadMessageAPTests.html |   4 +-
 ...ailableMBCategoryThreadMessageAPTests.java |   6 +-
 ...CurrentMBCategoryThreadMessageAPTests.html |   4 +-
 ...CurrentMBCategoryThreadMessageAPTests.java |   6 +-
 ...ContentMBCategoryThreadMessageAPTests.html |   4 +-
 ...ContentMBCategoryThreadMessageAPTests.java |   6 +-
 ...aximumItems5MBCategoryMessage6APTests.html |  14 +-
 ...aximumItems5MBCategoryMessage6APTests.java |  26 +-
 ...nationRegularMBCategoryThread6APTests.html |  14 +-
 ...nationRegularMBCategoryThread6APTests.java |  26 +-
 ...inationSimpleMBCategoryThread6APTests.html |  14 +-
 ...inationSimpleMBCategoryThread6APTests.java |  26 +-
 ...etTableMBCategoryThreadMessageAPTests.html |   4 +-
 ...etTableMBCategoryThreadMessageAPTests.java |   6 +-
 ...tleListMBCategoryThreadMessageAPTests.html |   4 +-
 ...tleListMBCategoryThreadMessageAPTests.java |   6 +-
 .../messageboards/hybrid/HybridTestPlan.java  |   4 +-
 .../AddMBCategorySiteTest.html                |   0
 .../AddMBCategorySiteTest.java                |   2 +-
 .../AddUserGmailTest.html                     |   0
 .../AddUserGmailTest.java                     |   2 +-
 .../ConfigurePortletEmailFromAddressTest.html |   0
 .../ConfigurePortletEmailFromAddressTest.java |   2 +-
 ...BCategoryMailingListActiveActionsTest.html |   0
 ...BCategoryMailingListActiveActionsTest.java |   2 +-
 .../Gmail_ViewMBThreadGmailTests.html}        |   2 +-
 .../Gmail_ViewMBThreadGmailTests.java}        |   6 +-
 .../HYBRID_Gmail_ViewMBThreadGmailTests.html} |   2 +-
 .../HYBRID_Gmail_ViewMBThreadGmailTests.java} |   6 +-
 .../PostNewMBCategoryThreadSiteTest.html}     |   4 +-
 .../PostNewMBCategoryThreadSiteTest.java}     |   7 +-
 .../ViewMBThreadGmailTest.html}               |   4 +-
 .../ViewMBThreadGmailTest.java}               |   6 +-
 .../mbmessage/MBMessageTestPlan.java          | 132 ---------
 .../ViewMBCategoryMessageTest.html            |  89 ------
 .../ViewMBCategoryMessageTest.java            |  73 -----
 .../AddMBCategoryMessageMultipleTests.java    |  47 ---
 .../AddMBCategoryMessageQuestionTest.html     | 183 ------------
 .../AddMBCategoryMessageQuestionTest.java     | 229 ---------------
 .../AddMBCategoryMessageReplyTest.html        | 158 ----------
 .../AddMBCategoryMessageReplyTest.java        | 207 -------------
 .../ViewMBCategoryMessageReplyTest.html       | 114 --------
 .../ViewMBCategoryMessageReplyTest.java       |  89 ------
 .../AddMBCategoryMessageReply1Test.html       | 163 -----------
 .../AddMBCategoryMessageReply1Test.java       | 208 -------------
 .../AddMBCategoryMessageReply2Test.html       | 168 -----------
 .../AddMBCategoryMessageReply2Test.java       | 213 --------------
 .../AddMBCategoryMessageReply3Test.html       | 178 ------------
 .../AddMBCategoryMessageReply3Test.java       | 219 --------------
 ...ddMBCategoryMessageReplyMultipleTests.html |  22 --
 ...ddMBCategoryMessageReplyMultipleTests.java |  46 ---
 .../addmbmessage/AddMBMessageTest.html        | 168 -----------
 .../addmbmessage/AddMBMessageTest.java        | 215 --------------
 .../AddMBSubcategoryMessageMultipleTests.html |  22 --
 ...AddMBCategoryMessageQuestionReplyTest.html | 193 -------------
 ...AddMBCategoryMessageQuestionReplyTest.java | 242 ----------------
 .../AddMBCategoryMessageQuestionTest.html     | 183 ------------
 .../AddMBCategoryMessageQuestionTest.java     | 229 ---------------
 ...rkAsAnswerMBCategoryMessageReplyTests.html |  22 --
 ...rkAsAnswerMBCategoryMessageReplyTests.java |  45 ---
 ...werMBCategoryMessageQuestionReplyTest.java | 132 ---------
 .../DeleteMBCategoryMessageTests.html         |  21 --
 .../DeleteMBCategoryMessageTests.java         |  45 ---
 .../EditMBCategoryMessageBodyTests.java       |  44 ---
 .../EditMBCategoryMessageBodyNullTests.html   |  20 --
 .../EditMBCategoryMessageSubjectTests.html    |  20 --
 ...EditMBCategoryMessageSubjectNullTests.html |  20 --
 ...AddMBCategoryMessageQuestionReplyTest.java | 242 ----------------
 .../AddMBCategoryMessageQuestionTest.java     | 229 ---------------
 ...werMBCategoryMessageQuestionReplyTest.html | 124 --------
 ...werMBCategoryMessageQuestionReplyTest.java | 132 ---------
 ...erMBCategoryMessageQuestionReplyTests.html |  21 --
 .../TearDownMBThreadMessageTest.html          | 253 ----------------
 .../TearDownMBThreadMessageTest.java          | 273 ------------------
 .../PostNewMBThreadsMessageTests.html         |  23 --
 .../PreviewMBThreadMessageDetailsTests.html   |  18 --
 .../PreviewMBThreadMessageDetailsTests.java   |  39 ---
 .../PreviousMBCategoryMessageTests.java       |  48 ---
 .../RateMBCategoryMessageTests.java           |  44 ---
 ...lyMBCategoryThreadMessageRepliesTests.java |  54 ----
 .../ReplyMBThreadMessageRepliesTests.html     |  24 --
 .../ReplyMBThreadMessageRepliesTests.java     |  50 ----
 ...eplyMBThreadMessageReplyMultipleTests.html |  24 --
 ...eplyMBThreadMessageReplyMultipleTests.java |  53 ----
 .../SearchMBCategoryMessageTests.html         |  21 --
 .../SearchMBCategoryMessageTests.java         |  45 ---
 ...hreadMBCategoryMessageReplyReplyTests.java |  51 ----
 ...AddMBCategoryMessageQuestionReplyTest.html | 193 -------------
 .../AddMBCategoryMessageQuestionTest.html     | 183 ------------
 ...werMBCategoryMessageQuestionReplyTest.html | 124 --------
 ...rkMBCategoryMessageQuestionReplyTests.html |  22 --
 ...rkMBCategoryMessageQuestionReplyTests.java |  45 ---
 .../ViewMBCategoryMessageMyPostsTests.html    |  20 --
 .../ViewMBCategoryMessageMyPostsTests.java    |  44 ---
 .../ViewMBCategoryMessagePostCountTests.html  |  25 --
 .../ViewMBCategoryMessagePostCountTests.java  |  51 ----
 ...ViewMBCategoryMessageRecentPostsTests.html |  20 --
 ...ViewMBCategoryMessageRecentPostsTests.java |  44 ---
 .../mbthread/MBMessageTestPlan.java           | 121 ++++++++
 ...kAsAnswerMBCategoryQuestionReplyTest.html} |   4 +-
 ...kAsAnswerMBCategoryQuestionReplyTest.java} |   6 +-
 ...kAsAnswerMBCategoryQuestionReplyTests.html |  22 ++
 ...AsAnswerMBCategoryQuestionReplyTests.java} |  19 +-
 .../DeleteMBCategoryThreadTest.html}          |   4 +-
 .../DeleteMBCategoryThreadTest.java}          |   6 +-
 .../DeleteMBCategoryThreadTests.html          |  21 ++
 .../DeleteMBCategoryThreadTests.java          |  45 +++
 .../ViewDeleteMBCategoryThreadTest.html}      |   4 +-
 .../ViewDeleteMBCategoryThreadTest.java}      |   6 +-
 .../EditMBCategoryThreadBodyTest.html}        |   4 +-
 .../EditMBCategoryThreadBodyTest.java}        |   6 +-
 .../EditMBCategoryThreadBodyTests.html        |  20 ++
 .../EditMBCategoryThreadBodyTests.java        |  44 +++
 .../EditMBCategoryThreadBodyNullTest.html}    |   4 +-
 .../EditMBCategoryThreadBodyNullTest.java}    |   6 +-
 .../EditMBCategoryThreadBodyNullTests.html}   |   8 +-
 .../EditMBCategoryThreadBodyNullTests.java}   |  10 +-
 .../EditMBCategoryThreadSubjectTest.html}     |   4 +-
 .../EditMBCategoryThreadSubjectTest.java}     |   6 +-
 .../EditMBCategoryThreadSubjectTests.html}    |   8 +-
 .../EditMBCategoryThreadSubjectTests.java     |  44 +++
 .../EditMBCategoryThreadSubjectNullTest.html} |   4 +-
 .../EditMBCategoryThreadSubjectNullTest.java} |   7 +-
 .../EditMBCategoryThreadSubjectNullTests.html |  20 ++
 .../EditMBCategoryThreadSubjectNullTests.java |  44 +++
 .../Guest_ViewMBThreadGuestViewOffTest.html}  |   4 +-
 .../Guest_ViewMBThreadGuestViewOffTest.java}  |   7 +-
 .../Guest_ViewMBThreadGuestViewOffTests.html} |  14 +-
 .../Guest_ViewMBThreadGuestViewOffTests.java} |  18 +-
 .../Guest_ViewMBThreadTest.html}              |   4 +-
 .../Guest_ViewMBThreadTest.java}              |   6 +-
 .../PermissionsMBThreadGuestViewOffTest.html} |   4 +-
 .../PermissionsMBThreadGuestViewOffTest.java} |   7 +-
 ...werMBCategoryThreadQuestionReplyTest.html} |   5 +-
 ...werMBCategoryThreadQuestionReplyTest.java} |   6 +-
 ...erMBCategoryThreadQuestionReplyTests.html} |   6 +-
 ...erMBCategoryThreadQuestionReplyTests.java} |  14 +-
 .../MoveMBCategoryThreadToCategoryTest.html}  |   4 +-
 .../MoveMBCategoryThreadToCategoryTest.java}  |   6 +-
 .../MoveMBCategoryThreadToCategoryTests.html} |   8 +-
 .../MoveMBCategoryThreadToCategoryTests.java} |  10 +-
 ...egoryThreadToCategoryExplanationTest.html} |   4 +-
 ...egoryThreadToCategoryExplanationTest.java} |   6 +-
 ...goryThreadToCategoryExplanationTests.html} |   8 +-
 ...goryThreadToCategoryExplanationTests.java} |  10 +-
 .../NextMBCategoryThreadTest.html}            |   4 +-
 .../NextMBCategoryThreadTest.java}            |   6 +-
 .../NextMBCategoryThreadTests.html}           |  11 +-
 .../NextMBCategoryThreadTests.java}           |  15 +-
 .../PostNewMBCategoriesThreadTests.html}      |  14 +-
 .../PostNewMBCategoriesThreadTests.java}      |  24 +-
 .../ViewMBCategory1ThreadTest.html}           |   4 +-
 .../ViewMBCategory1ThreadTest.java}           |   6 +-
 .../ViewMBCategory2ThreadTest.html}           |   4 +-
 .../ViewMBCategory2ThreadTest.java}           |   6 +-
 .../ViewMBCategory3ThreadTest.html}           |   4 +-
 .../ViewMBCategory3ThreadTest.java}           |   6 +-
 .../PostNewMBCategory1ThreadTest.html}        |   4 +-
 .../PostNewMBCategory1ThreadTest.java}        |   6 +-
 .../PostNewMBCategory2ThreadTest.html}        |   4 +-
 .../PostNewMBCategory2ThreadTest.java}        |   6 +-
 .../PostNewMBCategory3ThreadTest.html}        |   4 +-
 .../PostNewMBCategory3ThreadTest.java}        |   6 +-
 .../PostNewMBCategoryThread1Test.html}        |   4 +-
 .../PostNewMBCategoryThread1Test.java}        |   6 +-
 .../PostNewMBCategoryThread2Test.html}        |   4 +-
 .../PostNewMBCategoryThread2Test.java}        |   6 +-
 .../PostNewMBCategoryThread3Test.html}        |   4 +-
 .../PostNewMBCategoryThread3Test.java}        |   6 +-
 .../PostNewMBCategoryThread4Test.html}        |   4 +-
 .../PostNewMBCategoryThread4Test.java}        |   6 +-
 .../PostNewMBCategoryThread5Test.html}        |   4 +-
 .../PostNewMBCategoryThread5Test.java}        |   6 +-
 .../PostNewMBCategoryThread6Test.html}        |   4 +-
 .../PostNewMBCategoryThread6Test.java}        |   6 +-
 .../PostNewMBCategoryThreadTest.html}         |   4 +-
 .../PostNewMBCategoryThreadTest.java}         |   6 +-
 .../PostNewMBCategoryThreadTests.html}        |   6 +-
 .../PostNewMBCategoryThreadTests.java}        |  10 +-
 .../ViewMBCategoryThreadTest.html}            |   4 +-
 .../ViewMBCategoryThreadTest.java}            |   6 +-
 .../PostNewMBCategoryThreadBodyNullTest.html} |   4 +-
 .../PostNewMBCategoryThreadBodyNullTest.java} |   6 +-
 ...PostNewMBCategoryThreadBodyNullTests.html} |   6 +-
 ...PostNewMBCategoryThreadBodyNullTests.java} |   6 +-
 .../PostNewMBCategoryThreadQuestionTest.html} |   4 +-
 .../PostNewMBCategoryThreadQuestionTest.java} |   6 +-
 ...PostNewMBCategoryThreadQuestionTests.html} |   6 +-
 ...PostNewMBCategoryThreadQuestionTests.java} |   6 +-
 .../PostNewMBCategoryThreadsTests.html}       |  13 +-
 .../PostNewMBCategoryThreadsTests.java}       |  21 +-
 .../ViewMBCategoryThread1Test.html}           |   4 +-
 .../ViewMBCategoryThread1Test.java}           |   6 +-
 .../ViewMBCategoryThread2Test.html}           |   4 +-
 .../ViewMBCategoryThread2Test.java}           |   6 +-
 .../ViewMBCategoryThread3Test.html}           |   4 +-
 .../ViewMBCategoryThread3Test.java}           |   6 +-
 ...stNewMBCategoryThreadSubjectNullTest.html} |   4 +-
 ...stNewMBCategoryThreadSubjectNullTest.java} |   7 +-
 ...tNewMBCategoryThreadSubjectNullTests.html} |   6 +-
 ...tNewMBCategoryThreadSubjectNullTests.java} |   6 +-
 .../PostNewMBCategoryThreadUTF8Test.html}     |   4 +-
 .../PostNewMBCategoryThreadUTF8Test.java}     |   6 +-
 .../PostNewMBCategoryThreadUTF8Tests.html}    |   6 +-
 .../PostNewMBCategoryThreadUTF8Tests.java}    |   6 +-
 .../AddMBSubcategoryTest.html                 |   0
 .../AddMBSubcategoryTest.java                 |   2 +-
 .../PostNewMBSubcategoryThreadTest.html}      |   4 +-
 .../PostNewMBSubcategoryThreadTest.java}      |   6 +-
 .../PostNewMBSubcategoryThreadTests.html}     |   8 +-
 .../PostNewMBSubcategoryThreadTests.java}     |   8 +-
 .../ViewMBSubcategoryThreadTest.html}         |   4 +-
 .../ViewMBSubcategoryThreadTest.java}         |   6 +-
 ...stNewMBSubcategoryThreadBodyNullTest.html} |   4 +-
 ...stNewMBSubcategoryThreadBodyNullTest.java} |   7 +-
 ...tNewMBSubcategoryThreadBodyNullTests.html} |   8 +-
 ...tNewMBSubcategoryThreadBodyNullTests.java} |   8 +-
 .../PostNewMBSubcategoryThread1Test.html}     |   4 +-
 .../PostNewMBSubcategoryThread1Test.java}     |   6 +-
 .../PostNewMBSubcategoryThread2Test.html}     |   4 +-
 .../PostNewMBSubcategoryThread2Test.java}     |   6 +-
 .../PostNewMBSubcategoryThread3Test.html}     |   4 +-
 .../PostNewMBSubcategoryThread3Test.java}     |   6 +-
 .../PostNewMBSubcategoryThreadsTests.html}    |  11 +-
 .../PostNewMBSubcategoryThreadsTests.java}    |  12 +-
 ...ewMBSubcategoryThreadSubjectNullTest.html} |   4 +-
 ...ewMBSubcategoryThreadSubjectNullTest.java} |   6 +-
 ...ewMBSubcategoryThreadSubjectNullTests.html |  20 ++
 ...wMBSubcategoryThreadSubjectNullTests.java} |   8 +-
 .../PostNewMBThread1Test.html}                |   4 +-
 .../PostNewMBThread1Test.java}                |   6 +-
 .../PostNewMBThread2Test.html}                |   4 +-
 .../PostNewMBThread2Test.java}                |   6 +-
 .../PostNewMBThread3Test.html}                |   4 +-
 .../PostNewMBThread3Test.java}                |   6 +-
 .../postnewmbthread/PostNewMBThreadTest.html} |   4 +-
 .../postnewmbthread/PostNewMBThreadTest.java} |   6 +-
 .../PostNewMBThreadTests.html}                |   4 +-
 .../PostNewMBThreadTests.java}                |   8 +-
 .../TearDownMBThreadTest.html                 |   0
 .../TearDownMBThreadTest.java                 |   2 +-
 .../postnewmbthread/ViewMBThreadTest.html}    |   4 +-
 .../postnewmbthread/ViewMBThreadTest.java}    |   6 +-
 .../PostNewMBThreadsTests.html                |  23 ++
 .../PostNewMBThreadsTests.java                |  48 +++
 .../postnewmbthreads/ViewMBThread1Test.html}  |   4 +-
 .../postnewmbthreads/ViewMBThread1Test.java}  |   6 +-
 .../postnewmbthreads/ViewMBThread2Test.html}  |   4 +-
 .../postnewmbthreads/ViewMBThread2Test.java}  |   6 +-
 .../postnewmbthreads/ViewMBThread3Test.html}  |   4 +-
 .../postnewmbthreads/ViewMBThread3Test.java}  |   6 +-
 .../PreviewMBThreadDetailsTest.html}          |   4 +-
 .../PreviewMBThreadDetailsTest.java}          |   6 +-
 .../PreviewMBThreadDetailsTests.html}         |   4 +-
 .../PreviewMBThreadDetailsTests.java}         |   7 +-
 .../TearDownMBThreadTest.html}                |   5 +-
 .../TearDownMBThreadTest.java}                |   6 +-
 .../PreviousMBCategoryThreadTest.html}        |   4 +-
 .../PreviousMBCategoryThreadTest.java}        |   6 +-
 .../PreviousMBCategoryThreadTests.html}       |  12 +-
 .../PreviousMBCategoryThreadTests.java        |  48 +++
 .../RateMBCategoryThreadTest.html}            |   4 +-
 .../RateMBCategoryThreadTest.java}            |   6 +-
 .../RateMBCategoryThreadTests.html}           |   8 +-
 .../RateMBCategoryThreadTests.java            |  44 +++
 ...plyMBCategoryThreadQuestionReplyTest.html} |   4 +-
 ...plyMBCategoryThreadQuestionReplyTest.java} |   6 +-
 ...lyMBCategoryThreadQuestionReplyTests.html} |   8 +-
 ...plyMBCategoryThreadQuestionReplyTests.java |  44 +++
 .../ReplyMBCategoryThreadRepliesTests.html}   |  20 +-
 .../ReplyMBCategoryThreadRepliesTests.java}   |  26 +-
 .../ViewMBCategoryThreadReply1Test.html}      |   4 +-
 .../ViewMBCategoryThreadReply1Test.java}      |   7 +-
 .../ViewMBCategoryThreadReply2Test.html}      |   4 +-
 .../ViewMBCategoryThreadReply2Test.java}      |   7 +-
 .../ViewMBCategoryThreadReply3Test.html}      |   4 +-
 .../ViewMBCategoryThreadReply3Test.java}      |   7 +-
 .../ReplyMBCategoryThreadReply1Test.html}     |   4 +-
 .../ReplyMBCategoryThreadReply1Test.java}     |   7 +-
 .../ReplyMBCategoryThreadReply2Test.html}     |   4 +-
 .../ReplyMBCategoryThreadReply2Test.java}     |   7 +-
 .../ReplyMBCategoryThreadReply3Test.html}     |   4 +-
 .../ReplyMBCategoryThreadReply3Test.java}     |   7 +-
 .../ReplyMBCategoryThreadReplyTest.html}      |   4 +-
 .../ReplyMBCategoryThreadReplyTest.java}      |   7 +-
 .../ReplyMBCategoryThreadReplyTests.html      |  22 ++
 .../ReplyMBCategoryThreadReplyTests.java}     |  14 +-
 .../ViewMBCategoryThreadReplyTest.html}       |   4 +-
 .../ViewMBCategoryThreadReplyTest.java}       |   7 +-
 .../ReplyMBCategoryThreadReplyReplyTest.html} |   4 +-
 .../ReplyMBCategoryThreadReplyReplyTest.java} |   7 +-
 ...ReplyMBCategoryThreadReplyReplyTests.html} |  10 +-
 .../ReplyMBCategoryThreadReplyReplyTests.java |  49 ++++
 .../ViewMBCategoryThreadReplyReplyTest.html}  |   4 +-
 .../ViewMBCategoryThreadReplyReplyTest.java}  |   7 +-
 .../ReplyMBThreadRepliesTests.html            |  24 ++
 .../ReplyMBThreadRepliesTests.java}           |  26 +-
 .../ViewMBThreadReply1Test.html}              |   4 +-
 .../ViewMBThreadReply1Test.java}              |   6 +-
 .../ViewMBThreadReply2Test.html}              |   4 +-
 .../ViewMBThreadReply2Test.java}              |   6 +-
 .../ViewMBThreadReply3Test.html}              |   4 +-
 .../ViewMBThreadReply3Test.java}              |   6 +-
 .../ReplyMBThreadReply1Test.html}             |   4 +-
 .../ReplyMBThreadReply1Test.java}             |   6 +-
 .../ReplyMBThreadReply2Test.html}             |   4 +-
 .../ReplyMBThreadReply2Test.java}             |   6 +-
 .../ReplyMBThreadReply3Test.html}             |   4 +-
 .../ReplyMBThreadReply3Test.java}             |   6 +-
 .../ReplyMBThreadReplyTest.html}              |   4 +-
 .../ReplyMBThreadReplyTest.java}              |   6 +-
 .../ReplyMBThreadReplyTests.html}             |   8 +-
 .../ReplyMBThreadReplyTests.java}             |  14 +-
 .../ViewMBThreadReplyTest.html}               |   4 +-
 .../ViewMBThreadReplyTest.java}               |   6 +-
 .../SearchMBCategoryThreadQuotesTest.html}    |   4 +-
 .../SearchMBCategoryThreadQuotesTest.java}    |   6 +-
 .../SearchMBCategoryThreadTest.html}          |   4 +-
 .../SearchMBCategoryThreadTest.java}          |   6 +-
 .../SearchMBCategoryThreadTests.html          |  21 ++
 .../SearchMBCategoryThreadTests.java}         |  11 +-
 ...SplitThreadMBCategoryThreadReplyTest.html} |   4 +-
 ...SplitThreadMBCategoryThreadReplyTest.java} |   6 +-
 ...plitThreadMBCategoryThreadReplyTests.html} |  10 +-
 ...plitThreadMBCategoryThreadReplyTests.java} |  15 +-
 ...SplitThreadMBCategoryThreadReplyTest.html} |   4 +-
 ...SplitThreadMBCategoryThreadReplyTest.java} |   6 +-
 ...dMBCategoryThreadReplyBackButtonTest.html} |   4 +-
 ...dMBCategoryThreadReplyBackButtonTest.java} |   7 +-
 ...MBCategoryThreadReplyBackButtonTests.html} |   7 +-
 ...MBCategoryThreadReplyBackButtonTests.java} |  12 +-
 ...MBCategoryThreadReplyExplanationTest.html} |   4 +-
 ...MBCategoryThreadReplyExplanationTest.java} |   6 +-
 ...BCategoryThreadReplyExplanationTests.html} |  10 +-
 ...BCategoryThreadReplyExplanationTests.java} |  19 +-
 ...MBCategoryThreadReplyExplanationTest.html} |   4 +-
 ...MBCategoryThreadReplyExplanationTest.java} |   6 +-
 ...ThreadMBCategoryThreadReplyReplyTest.html} |   4 +-
 ...ThreadMBCategoryThreadReplyReplyTest.java} |   6 +-
 ...hreadMBCategoryThreadReplyReplyTests.html} |  13 +-
 ...ThreadMBCategoryThreadReplyReplyTests.java |  51 ++++
 ...ThreadMBCategoryThreadReplyReplyTest.html} |   4 +-
 ...ThreadMBCategoryThreadReplyReplyTest.java} |   6 +-
 ...arkMBCategoryThreadQuestionReplyTest.html} |   5 +-
 ...arkMBCategoryThreadQuestionReplyTest.java} |   6 +-
 ...rkMBCategoryThreadQuestionReplyTests.html} |  12 +-
 ...rkMBCategoryThreadQuestionReplyTests.java} |  18 +-
 .../ViewMBCategoryThreadMyPostsTest.html}     |   4 +-
 .../ViewMBCategoryThreadMyPostsTest.java}     |   6 +-
 .../ViewMBCategoryThreadMyPostsTests.html     |  20 ++
 .../ViewMBCategoryThreadMyPostsTests.java     |  44 +++
 .../ReplyMBCategoryThread1Reply1Test.html}    |   4 +-
 .../ReplyMBCategoryThread1Reply1Test.java}    |   6 +-
 .../ReplyMBCategoryThread1Reply2Test.html}    |   4 +-
 .../ReplyMBCategoryThread1Reply2Test.java}    |   6 +-
 .../ReplyMBCategoryThread1Reply3Test.html}    |   4 +-
 .../ReplyMBCategoryThread1Reply3Test.java}    |   6 +-
 .../ViewMBCategoryThreadPostCountTest.html}   |   4 +-
 .../ViewMBCategoryThreadPostCountTest.java}   |   6 +-
 .../ViewMBCategoryThreadPostCountTests.html   |  25 ++
 .../ViewMBCategoryThreadPostCountTests.java}  |  17 +-
 .../ViewMBCategoryThreadRecentPostsTest.html} |   4 +-
 .../ViewMBCategoryThreadRecentPostsTest.java} |   7 +-
 .../ViewMBCategoryThreadRecentPostsTests.html |  20 ++
 .../ViewMBCategoryThreadRecentPostsTests.java |  44 +++
 .../ViewMBThreadPreviousNextNoTests.html      |   6 +-
 .../ViewMBThreadPreviousNextNoTests.java      |  10 +-
 371 files changed, 1853 insertions(+), 7613 deletions(-)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/{gmailviewmbthreadmessagegmail => gmailviewmbthreadgmail}/AddMBCategorySiteTest.html (100%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/{gmailviewmbthreadmessagegmail => gmailviewmbthreadgmail}/AddMBCategorySiteTest.java (98%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/{gmailviewmbthreadmessagegmail => gmailviewmbthreadgmail}/AddUserGmailTest.html (100%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/{gmailviewmbthreadmessagegmail => gmailviewmbthreadgmail}/AddUserGmailTest.java (99%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/{gmailviewmbthreadmessagegmail => gmailviewmbthreadgmail}/ConfigurePortletEmailFromAddressTest.html (100%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/{gmailviewmbthreadmessagegmail => gmailviewmbthreadgmail}/ConfigurePortletEmailFromAddressTest.java (99%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/{gmailviewmbthreadmessagegmail => gmailviewmbthreadgmail}/EditMBCategoryMailingListActiveActionsTest.html (100%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/{gmailviewmbthreadmessagegmail => gmailviewmbthreadgmail}/EditMBCategoryMailingListActiveActionsTest.java (99%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/{gmailviewmbthreadmessagegmail/Gmail_ViewMBThreadMessageGmailTests.html => gmailviewmbthreadgmail/Gmail_ViewMBThreadGmailTests.html} (93%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/{gmailviewmbthreadmessagegmail/Gmail_ViewMBThreadMessageGmailTests.java => gmailviewmbthreadgmail/Gmail_ViewMBThreadGmailTests.java} (92%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/{gmailviewmbthreadmessagegmail/HYBRID_Gmail_ViewMBThreadMessageGmailTests.html => gmailviewmbthreadgmail/HYBRID_Gmail_ViewMBThreadGmailTests.html} (92%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/{gmailviewmbthreadmessagegmail/HYBRID_Gmail_ViewMBThreadMessageGmailTests.java => gmailviewmbthreadgmail/HYBRID_Gmail_ViewMBThreadGmailTests.java} (90%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/{gmailviewmbthreadmessagegmail/PostNewMBCategoryThreadMessageSiteTest.html => gmailviewmbthreadgmail/PostNewMBCategoryThreadSiteTest.html} (96%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/{gmailviewmbthreadmessagegmail/PostNewMBCategoryThreadMessageSiteTest.java => gmailviewmbthreadgmail/PostNewMBCategoryThreadSiteTest.java} (97%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/{gmailviewmbthreadmessagegmail/ViewMBThreadMessageGmailTest.html => gmailviewmbthreadgmail/ViewMBThreadGmailTest.html} (93%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/{gmailviewmbthreadmessagegmail/ViewMBThreadMessageGmailTest.java => gmailviewmbthreadgmail/ViewMBThreadGmailTest.java} (94%)
 delete mode 100644 portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/MBMessageTestPlan.java
 delete mode 100644 portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessage/ViewMBCategoryMessageTest.html
 delete mode 100644 portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessage/ViewMBCategoryMessageTest.java
 delete mode 100644 portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessagemultiple/AddMBCategoryMessageMultipleTests.java
 delete mode 100644 portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessagequestion/AddMBCategoryMessageQuestionTest.html
 delete mode 100644 portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessagequestion/AddMBCategoryMessageQuestionTest.java
 delete mode 100644 portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessagereply/AddMBCategoryMessageReplyTest.html
 delete mode 100644 portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessagereply/AddMBCategoryMessageReplyTest.java
 delete mode 100644 portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessagereply/ViewMBCategoryMessageReplyTest.html
 delete mode 100644 portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessagereply/ViewMBCategoryMessageReplyTest.java
 delete mode 100644 portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessagereplymultiple/AddMBCategoryMessageReply1Test.html
 delete mode 100644 portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessagereplymultiple/AddMBCategoryMessageReply1Test.java
 delete mode 100644 portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessagereplymultiple/AddMBCategoryMessageReply2Test.html
 delete mode 100644 portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessagereplymultiple/AddMBCategoryMessageReply2Test.java
 delete mode 100644 portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessagereplymultiple/AddMBCategoryMessageReply3Test.html
 delete mode 100644 portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessagereplymultiple/AddMBCategoryMessageReply3Test.java
 delete mode 100644 portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessagereplymultiple/AddMBCategoryMessageReplyMultipleTests.html
 delete mode 100644 portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessagereplymultiple/AddMBCategoryMessageReplyMultipleTests.java
 delete mode 100644 portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbmessage/AddMBMessageTest.html
 delete mode 100644 portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbmessage/AddMBMessageTest.java
 delete mode 100644 portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbsubcategorymessagemultiple/AddMBSubcategoryMessageMultipleTests.html
 delete mode 100644 portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/deletemarkasanswermbcategorymessagereply/AddMBCategoryMessageQuestionReplyTest.html
 delete mode 100644 portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/deletemarkasanswermbcategorymessagereply/AddMBCategoryMessageQuestionReplyTest.java
 delete mode 100644 portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/deletemarkasanswermbcategorymessagereply/AddMBCategoryMessageQuestionTest.html
 delete mode 100644 portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/deletemarkasanswermbcategorymessagereply/AddMBCategoryMessageQuestionTest.java
 delete mode 100644 portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/deletemarkasanswermbcategorymessagereply/DeleteMarkAsAnswerMBCategoryMessageReplyTests.html
 delete mode 100644 portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/deletemarkasanswermbcategorymessagereply/DeleteMarkAsAnswerMBCategoryMessageReplyTests.java
 delete mode 100644 portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/deletemarkasanswermbcategorymessagereply/MarkAsAnswerMBCategoryMessageQuestionReplyTest.java
 delete mode 100644 portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/deletembcategorymessage/DeleteMBCategoryMessageTests.html
 delete mode 100644 portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/deletembcategorymessage/DeleteMBCategoryMessageTests.java
 delete mode 100644 portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/editmbcategorymessagebody/EditMBCategoryMessageBodyTests.java
 delete mode 100644 portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/editmbcategorymessagebodynull/EditMBCategoryMessageBodyNullTests.html
 delete mode 100644 portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/editmbcategorymessagesubject/EditMBCategoryMessageSubjectTests.html
 delete mode 100644 portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/editmbcategorymessagesubjectnull/EditMBCategoryMessageSubjectNullTests.html
 delete mode 100644 portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/markasanswermbcategorymessagequestionreply/AddMBCategoryMessageQuestionReplyTest.java
 delete mode 100644 portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/markasanswermbcategorymessagequestionreply/AddMBCategoryMessageQuestionTest.java
 delete mode 100644 portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/markasanswermbcategorymessagequestionreply/MarkAsAnswerMBCategoryMessageQuestionReplyTest.html
 delete mode 100644 portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/markasanswermbcategorymessagequestionreply/MarkAsAnswerMBCategoryMessageQuestionReplyTest.java
 delete mode 100644 portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/markasanswermbcategorymessagequestionreply/MarkAsAnswerMBCategoryMessageQuestionReplyTests.html
 delete mode 100644 portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbthreadmessage/TearDownMBThreadMessageTest.html
 delete mode 100644 portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbthreadmessage/TearDownMBThreadMessageTest.java
 delete mode 100644 portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbthreadsmessage/PostNewMBThreadsMessageTests.html
 delete mode 100644 portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/previewmbthreadmessagedetails/PreviewMBThreadMessageDetailsTests.html
 delete mode 100644 portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/previewmbthreadmessagedetails/PreviewMBThreadMessageDetailsTests.java
 delete mode 100644 portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/previousmbcategorymessage/PreviousMBCategoryMessageTests.java
 delete mode 100644 portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/ratembcategorymessage/RateMBCategoryMessageTests.java
 delete mode 100644 portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbcategorythreadmessagereplies/ReplyMBCategoryThreadMessageRepliesTests.java
 delete mode 100644 portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbthreadmessagereplies/ReplyMBThreadMessageRepliesTests.html
 delete mode 100644 portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbthreadmessagereplies/ReplyMBThreadMessageRepliesTests.java
 delete mode 100644 portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbthreadmessagereplymultiple/ReplyMBThreadMessageReplyMultipleTests.html
 delete mode 100644 portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbthreadmessagereplymultiple/ReplyMBThreadMessageReplyMultipleTests.java
 delete mode 100644 portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/searchmbcategorymessage/SearchMBCategoryMessageTests.html
 delete mode 100644 portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/searchmbcategorymessage/SearchMBCategoryMessageTests.java
 delete mode 100644 portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/splitthreadmbcategorymessagereplyreply/SplitThreadMBCategoryMessageReplyReplyTests.java
 delete mode 100644 portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/unmarkmbcategorymessagequestionreply/AddMBCategoryMessageQuestionReplyTest.html
 delete mode 100644 portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/unmarkmbcategorymessagequestionreply/AddMBCategoryMessageQuestionTest.html
 delete mode 100644 portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/unmarkmbcategorymessagequestionreply/MarkAsAnswerMBCategoryMessageQuestionReplyTest.html
 delete mode 100644 portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/unmarkmbcategorymessagequestionreply/UnmarkMBCategoryMessageQuestionReplyTests.html
 delete mode 100644 portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/unmarkmbcategorymessagequestionreply/UnmarkMBCategoryMessageQuestionReplyTests.java
 delete mode 100644 portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/viewmbcategorymessagemyposts/ViewMBCategoryMessageMyPostsTests.html
 delete mode 100644 portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/viewmbcategorymessagemyposts/ViewMBCategoryMessageMyPostsTests.java
 delete mode 100644 portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/viewmbcategorymessagepostcount/ViewMBCategoryMessagePostCountTests.html
 delete mode 100644 portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/viewmbcategorymessagepostcount/ViewMBCategoryMessagePostCountTests.java
 delete mode 100644 portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/viewmbcategorymessagerecentposts/ViewMBCategoryMessageRecentPostsTests.html
 delete mode 100644 portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/viewmbcategorymessagerecentposts/ViewMBCategoryMessageRecentPostsTests.java
 create mode 100644 portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/MBMessageTestPlan.java
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/deletemarkasanswermbcategorymessagereply/DeleteMarkAsAnswerMBCategoryMessageReplyTest.html => mbthread/deletemarkasanswermbcategoryquestionreply/DeleteMarkAsAnswerMBCategoryQuestionReplyTest.html} (91%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/deletemarkasanswermbcategorymessagereply/DeleteMarkAsAnswerMBCategoryMessageReplyTest.java => mbthread/deletemarkasanswermbcategoryquestionreply/DeleteMarkAsAnswerMBCategoryQuestionReplyTest.java} (92%)
 create mode 100644 portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/deletemarkasanswermbcategoryquestionreply/DeleteMarkAsAnswerMBCategoryQuestionReplyTests.html
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/splitthreadmbcategorymessagereplyexplanation/SplitThreadMBCategoryMessageReplyExplanationTests.java => mbthread/deletemarkasanswermbcategoryquestionreply/DeleteMarkAsAnswerMBCategoryQuestionReplyTests.java} (63%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/deletembcategorymessage/DeleteMBCategoryMessageTest.html => mbthread/deletembcategorythread/DeleteMBCategoryThreadTest.html} (93%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/deletembcategorymessage/DeleteMBCategoryMessageTest.java => mbthread/deletembcategorythread/DeleteMBCategoryThreadTest.java} (92%)
 create mode 100644 portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/deletembcategorythread/DeleteMBCategoryThreadTests.html
 create mode 100644 portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/deletembcategorythread/DeleteMBCategoryThreadTests.java
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/deletembcategorymessage/ViewDeleteMBCategoryMessageTest.html => mbthread/deletembcategorythread/ViewDeleteMBCategoryThreadTest.html} (88%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/deletembcategorymessage/ViewDeleteMBCategoryMessageTest.java => mbthread/deletembcategorythread/ViewDeleteMBCategoryThreadTest.java} (89%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/editmbcategorymessagebody/EditMBCategoryMessageBodyTest.html => mbthread/editmbcategorythreadbody/EditMBCategoryThreadBodyTest.html} (96%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/editmbcategorymessagebody/EditMBCategoryMessageBodyTest.java => mbthread/editmbcategorythreadbody/EditMBCategoryThreadBodyTest.java} (96%)
 create mode 100644 portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/editmbcategorythreadbody/EditMBCategoryThreadBodyTests.html
 create mode 100644 portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/editmbcategorythreadbody/EditMBCategoryThreadBodyTests.java
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/editmbcategorymessagebodynull/EditMBCategoryMessageBodyNullTest.html => mbthread/editmbcategorythreadbodynull/EditMBCategoryThreadBodyNullTest.html} (96%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/editmbcategorymessagebodynull/EditMBCategoryMessageBodyNullTest.java => mbthread/editmbcategorythreadbodynull/EditMBCategoryThreadBodyNullTest.java} (96%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/editmbcategorymessagebody/EditMBCategoryMessageBodyTests.html => mbthread/editmbcategorythreadbodynull/EditMBCategoryThreadBodyNullTests.html} (78%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/addmbcategorymessage/AddMBCategoryMessageTests.java => mbthread/editmbcategorythreadbodynull/EditMBCategoryThreadBodyNullTests.java} (79%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/editmbcategorymessagesubject/EditMBCategoryMessageSubjectTest.html => mbthread/editmbcategorythreadsubject/EditMBCategoryThreadSubjectTest.html} (95%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/editmbcategorymessagesubject/EditMBCategoryMessageSubjectTest.java => mbthread/editmbcategorythreadsubject/EditMBCategoryThreadSubjectTest.java} (95%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/addmbsubcategorymessagebodynull/AddMBSubcategoryMessageBodyNullTests.html => mbthread/editmbcategorythreadsubject/EditMBCategoryThreadSubjectTests.html} (78%)
 create mode 100644 portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/editmbcategorythreadsubject/EditMBCategoryThreadSubjectTests.java
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/editmbcategorymessagesubjectnull/EditMBCategoryMessageSubjectNullTest.html => mbthread/editmbcategorythreadsubjectnull/EditMBCategoryThreadSubjectNullTest.html} (94%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/editmbcategorymessagesubjectnull/EditMBCategoryMessageSubjectNullTest.java => mbthread/editmbcategorythreadsubjectnull/EditMBCategoryThreadSubjectNullTest.java} (94%)
 create mode 100644 portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/editmbcategorythreadsubjectnull/EditMBCategoryThreadSubjectNullTests.html
 create mode 100644 portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/editmbcategorythreadsubjectnull/EditMBCategoryThreadSubjectNullTests.java
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/guestviewmbthreadmessageguestviewoff/Guest_ViewMBThreadMessageGuestViewOffTest.html => mbthread/guestviewmbthreadguestviewoff/Guest_ViewMBThreadGuestViewOffTest.html} (82%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/guestviewmbthreadmessageguestviewoff/Guest_ViewMBThreadMessageGuestViewOffTest.java => mbthread/guestviewmbthreadguestviewoff/Guest_ViewMBThreadGuestViewOffTest.java} (84%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/guestviewmbthreadmessageguestviewoff/Guest_ViewMBThreadMessageGuestViewOffTests.html => mbthread/guestviewmbthreadguestviewoff/Guest_ViewMBThreadGuestViewOffTests.html} (67%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/guestviewmbthreadmessageguestviewoff/Guest_ViewMBThreadMessageGuestViewOffTests.java => mbthread/guestviewmbthreadguestviewoff/Guest_ViewMBThreadGuestViewOffTests.java} (67%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/guestviewmbthreadmessageguestviewoff/Guest_ViewMBThreadMessageTest.html => mbthread/guestviewmbthreadguestviewoff/Guest_ViewMBThreadTest.html} (92%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/guestviewmbthreadmessageguestviewoff/Guest_ViewMBThreadMessageTest.java => mbthread/guestviewmbthreadguestviewoff/Guest_ViewMBThreadTest.java} (91%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/guestviewmbthreadmessageguestviewoff/PermissionsMBThreadMessageGuestViewOffTest.html => mbthread/guestviewmbthreadguestviewoff/PermissionsMBThreadGuestViewOffTest.html} (91%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/guestviewmbthreadmessageguestviewoff/PermissionsMBThreadMessageGuestViewOffTest.java => mbthread/guestviewmbthreadguestviewoff/PermissionsMBThreadGuestViewOffTest.java} (90%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/deletemarkasanswermbcategorymessagereply/MarkAsAnswerMBCategoryMessageQuestionReplyTest.html => mbthread/markasanswermbcategorythreadquestionreply/MarkAsAnswerMBCategoryThreadQuestionReplyTest.html} (93%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/unmarkmbcategorymessagequestionreply/MarkAsAnswerMBCategoryMessageQuestionReplyTest.java => mbthread/markasanswermbcategorythreadquestionreply/MarkAsAnswerMBCategoryThreadQuestionReplyTest.java} (94%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/splitthreadmbcategorymessagereplybackbutton/SplitThreadMBCategoryMessageReplyBackButtonTests.html => mbthread/markasanswermbcategorythreadquestionreply/MarkAsAnswerMBCategoryThreadQuestionReplyTests.html} (76%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/splitthreadmbcategorymessagereplybackbutton/SplitThreadMBCategoryMessageReplyBackButtonTests.java => mbthread/markasanswermbcategorythreadquestionreply/MarkAsAnswerMBCategoryThreadQuestionReplyTests.java} (70%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/movembcategorymessagetocategory/MoveMBCategoryMessageToCategoryTest.html => mbthread/movembcategorythreadtocategory/MoveMBCategoryThreadToCategoryTest.html} (96%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/movembcategorymessagetocategory/MoveMBCategoryMessageToCategoryTest.java => mbthread/movembcategorythreadtocategory/MoveMBCategoryThreadToCategoryTest.java} (95%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/movembcategorymessagetocategory/MoveMBCategoryMessageToCategoryTests.html => mbthread/movembcategorythreadtocategory/MoveMBCategoryThreadToCategoryTests.html} (78%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/movembcategorymessagetocategory/MoveMBCategoryMessageToCategoryTests.java => mbthread/movembcategorythreadtocategory/MoveMBCategoryThreadToCategoryTests.java} (79%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/movembcategorymessagetocategoryexplanation/MoveMBCategoryMessageToCategoryExplanationTest.html => mbthread/movembcategorythreadtocategoryexplanation/MoveMBCategoryThreadToCategoryExplanationTest.html} (97%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/movembcategorymessagetocategoryexplanation/MoveMBCategoryMessageToCategoryExplanationTest.java => mbthread/movembcategorythreadtocategoryexplanation/MoveMBCategoryThreadToCategoryExplanationTest.java} (97%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/movembcategorymessagetocategoryexplanation/MoveMBCategoryMessageToCategoryExplanationTests.html => mbthread/movembcategorythreadtocategoryexplanation/MoveMBCategoryThreadToCategoryExplanationTests.html} (76%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/movembcategorymessagetocategoryexplanation/MoveMBCategoryMessageToCategoryExplanationTests.java => mbthread/movembcategorythreadtocategoryexplanation/MoveMBCategoryThreadToCategoryExplanationTests.java} (79%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/nextmbcategorymessage/NextMBCategoryMessageTest.html => mbthread/nextmbcategorythread/NextMBCategoryThreadTest.html} (93%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/nextmbcategorymessage/NextMBCategoryMessageTest.java => mbthread/nextmbcategorythread/NextMBCategoryThreadTest.java} (93%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/addmbcategorymessagemultiple/AddMBCategoryMessageMultipleTests.html => mbthread/nextmbcategorythread/NextMBCategoryThreadTests.html} (71%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/addmbcategorymessagereply/AddMBCategoryMessageReplyTests.java => mbthread/nextmbcategorythread/NextMBCategoryThreadTests.java} (67%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/postnewmbcategoriesthreadmessage/PostNewMBCategoriesThreadMessageTests.html => mbthread/postnewmbcategoriesthread/PostNewMBCategoriesThreadTests.html} (68%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/postnewmbcategoriesthreadmessage/PostNewMBCategoriesThreadMessageTests.java => mbthread/postnewmbcategoriesthread/PostNewMBCategoriesThreadTests.java} (63%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/postnewmbcategoriesthreadmessage/ViewMBCategory1ThreadMessageTest.html => mbthread/postnewmbcategoriesthread/ViewMBCategory1ThreadTest.html} (94%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/postnewmbcategoriesthreadmessage/ViewMBCategory1ThreadMessageTest.java => mbthread/postnewmbcategoriesthread/ViewMBCategory1ThreadTest.java} (93%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/postnewmbcategoriesthreadmessage/ViewMBCategory2ThreadMessageTest.html => mbthread/postnewmbcategoriesthread/ViewMBCategory2ThreadTest.html} (94%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/postnewmbcategoriesthreadmessage/ViewMBCategory2ThreadMessageTest.java => mbthread/postnewmbcategoriesthread/ViewMBCategory2ThreadTest.java} (93%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/postnewmbcategoriesthreadmessage/ViewMBCategory3ThreadMessageTest.html => mbthread/postnewmbcategoriesthread/ViewMBCategory3ThreadTest.html} (94%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/postnewmbcategoriesthreadmessage/ViewMBCategory3ThreadMessageTest.java => mbthread/postnewmbcategoriesthread/ViewMBCategory3ThreadTest.java} (93%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/postnewmbcategorythreadmessage/PostNewMBCategory1ThreadMessageTest.html => mbthread/postnewmbcategorythread/PostNewMBCategory1ThreadTest.html} (95%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/postnewmbcategorythreadmessage/PostNewMBCategory1ThreadMessageTest.java => mbthread/postnewmbcategorythread/PostNewMBCategory1ThreadTest.java} (95%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/postnewmbcategorythreadmessage/PostNewMBCategory2ThreadMessageTest.html => mbthread/postnewmbcategorythread/PostNewMBCategory2ThreadTest.html} (95%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/postnewmbcategorythreadmessage/PostNewMBCategory2ThreadMessageTest.java => mbthread/postnewmbcategorythread/PostNewMBCategory2ThreadTest.java} (95%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/postnewmbcategorythreadmessage/PostNewMBCategory3ThreadMessageTest.html => mbthread/postnewmbcategorythread/PostNewMBCategory3ThreadTest.html} (95%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/postnewmbcategorythreadmessage/PostNewMBCategory3ThreadMessageTest.java => mbthread/postnewmbcategorythread/PostNewMBCategory3ThreadTest.java} (95%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThread1MessageTest.html => mbthread/postnewmbcategorythread/PostNewMBCategoryThread1Test.html} (95%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThread1MessageTest.java => mbthread/postnewmbcategorythread/PostNewMBCategoryThread1Test.java} (94%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThread2MessageTest.html => mbthread/postnewmbcategorythread/PostNewMBCategoryThread2Test.html} (95%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThread2MessageTest.java => mbthread/postnewmbcategorythread/PostNewMBCategoryThread2Test.java} (94%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThread3MessageTest.html => mbthread/postnewmbcategorythread/PostNewMBCategoryThread3Test.html} (95%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThread3MessageTest.java => mbthread/postnewmbcategorythread/PostNewMBCategoryThread3Test.java} (94%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThread4MessageTest.html => mbthread/postnewmbcategorythread/PostNewMBCategoryThread4Test.html} (95%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThread4MessageTest.java => mbthread/postnewmbcategorythread/PostNewMBCategoryThread4Test.java} (94%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThread5MessageTest.html => mbthread/postnewmbcategorythread/PostNewMBCategoryThread5Test.html} (95%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThread5MessageTest.java => mbthread/postnewmbcategorythread/PostNewMBCategoryThread5Test.java} (94%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThread6MessageTest.html => mbthread/postnewmbcategorythread/PostNewMBCategoryThread6Test.html} (95%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThread6MessageTest.java => mbthread/postnewmbcategorythread/PostNewMBCategoryThread6Test.java} (94%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThreadMessageTest.html => mbthread/postnewmbcategorythread/PostNewMBCategoryThreadTest.html} (95%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThreadMessageTest.java => mbthread/postnewmbcategorythread/PostNewMBCategoryThreadTest.java} (95%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThreadMessageTests.html => mbthread/postnewmbcategorythread/PostNewMBCategoryThreadTests.html} (80%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThreadMessageTests.java => mbthread/postnewmbcategorythread/PostNewMBCategoryThreadTests.java} (79%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/postnewmbcategorythreadmessage/ViewMBCategoryThreadMessageTest.html => mbthread/postnewmbcategorythread/ViewMBCategoryThreadTest.html} (94%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/postnewmbcategorythreadmessage/ViewMBCategoryThreadMessageTest.java => mbthread/postnewmbcategorythread/ViewMBCategoryThreadTest.java} (93%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/addmbcategorymessagebodynull/AddMBCategoryMessageBodyNullTest.html => mbthread/postnewmbcategorythreadbodynull/PostNewMBCategoryThreadBodyNullTest.html} (96%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/addmbcategorymessagebodynull/AddMBCategoryMessageBodyNullTest.java => mbthread/postnewmbcategorythreadbodynull/PostNewMBCategoryThreadBodyNullTest.java} (96%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/addmbcategorymessagesubjectnull/AddMBCategoryMessageSubjectNullTests.html => mbthread/postnewmbcategorythreadbodynull/PostNewMBCategoryThreadBodyNullTests.html} (83%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/addmbcategorymessagesubjectnull/AddMBCategoryMessageSubjectNullTests.java => mbthread/postnewmbcategorythreadbodynull/PostNewMBCategoryThreadBodyNullTests.java} (87%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/markasanswermbcategorymessagequestionreply/AddMBCategoryMessageQuestionTest.html => mbthread/postnewmbcategorythreadquestion/PostNewMBCategoryThreadQuestionTest.html} (96%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/unmarkmbcategorymessagequestionreply/AddMBCategoryMessageQuestionTest.java => mbthread/postnewmbcategorythreadquestion/PostNewMBCategoryThreadQuestionTest.java} (96%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/addmbcategorymessagequestion/AddMBCategoryMessageQuestionTests.html => mbthread/postnewmbcategorythreadquestion/PostNewMBCategoryThreadQuestionTests.html} (83%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/addmbcategorymessagebodynull/AddMBCategoryMessageBodyNullTests.java => mbthread/postnewmbcategorythreadquestion/PostNewMBCategoryThreadQuestionTests.java} (86%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/splitthreadmbcategorymessagereplyreply/SplitThreadMBCategoryMessageReplyReplyTests.html => mbthread/postnewmbcategorythreads/PostNewMBCategoryThreadsTests.html} (64%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/replymbcategorythreadmessagereplyreply/ReplyMBCategoryThreadMessageReplyReplyTests.java => mbthread/postnewmbcategorythreads/PostNewMBCategoryThreadsTests.java} (62%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/postnewmbcategorythreadsmessage/ViewMBCategoryThread1MessageTest.html => mbthread/postnewmbcategorythreads/ViewMBCategoryThread1Test.html} (94%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/postnewmbcategorythreadsmessage/ViewMBCategoryThread1MessageTest.java => mbthread/postnewmbcategorythreads/ViewMBCategoryThread1Test.java} (93%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/postnewmbcategorythreadsmessage/ViewMBCategoryThread2MessageTest.html => mbthread/postnewmbcategorythreads/ViewMBCategoryThread2Test.html} (95%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/postnewmbcategorythreadsmessage/ViewMBCategoryThread2MessageTest.java => mbthread/postnewmbcategorythreads/ViewMBCategoryThread2Test.java} (94%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/postnewmbcategorythreadsmessage/ViewMBCategoryThread3MessageTest.html => mbthread/postnewmbcategorythreads/ViewMBCategoryThread3Test.html} (96%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/postnewmbcategorythreadsmessage/ViewMBCategoryThread3MessageTest.java => mbthread/postnewmbcategorythreads/ViewMBCategoryThread3Test.java} (95%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/addmbcategorymessagesubjectnull/AddMBCategoryMessageSubjectNullTest.html => mbthread/postnewmbcategorythreadsubjectnull/PostNewMBCategoryThreadSubjectNullTest.html} (95%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/addmbcategorymessagesubjectnull/AddMBCategoryMessageSubjectNullTest.java => mbthread/postnewmbcategorythreadsubjectnull/PostNewMBCategoryThreadSubjectNullTest.java} (95%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/addmbcategorymessagebodynull/AddMBCategoryMessageBodyNullTests.html => mbthread/postnewmbcategorythreadsubjectnull/PostNewMBCategoryThreadSubjectNullTests.html} (82%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/addmbcategorymessagequestion/AddMBCategoryMessageQuestionTests.java => mbthread/postnewmbcategorythreadsubjectnull/PostNewMBCategoryThreadSubjectNullTests.java} (86%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/addmbcategorymessageutf8/AddMBCategoryMessageUTF8Test.html => mbthread/postnewmbcategorythreadutf8/PostNewMBCategoryThreadUTF8Test.html} (96%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/addmbcategorymessageutf8/AddMBCategoryMessageUTF8Test.java => mbthread/postnewmbcategorythreadutf8/PostNewMBCategoryThreadUTF8Test.java} (96%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/addmbcategorymessageutf8/AddMBCategoryMessageUTF8Tests.html => mbthread/postnewmbcategorythreadutf8/PostNewMBCategoryThreadUTF8Tests.html} (84%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/addmbcategorymessageutf8/AddMBCategoryMessageUTF8Tests.java => mbthread/postnewmbcategorythreadutf8/PostNewMBCategoryThreadUTF8Tests.java} (87%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/addmbsubcategorymessage => mbthread/postnewmbsubcategorythread}/AddMBSubcategoryTest.html (100%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/addmbsubcategorymessage => mbthread/postnewmbsubcategorythread}/AddMBSubcategoryTest.java (96%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/addmbsubcategorymessage/AddMBSubcategoryMessageTest.html => mbthread/postnewmbsubcategorythread/PostNewMBSubcategoryThreadTest.html} (96%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/addmbsubcategorymessage/AddMBSubcategoryMessageTest.java => mbthread/postnewmbsubcategorythread/PostNewMBSubcategoryThreadTest.java} (96%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/addmbsubcategorymessage/AddMBSubcategoryMessageTests.html => mbthread/postnewmbsubcategorythread/PostNewMBSubcategoryThreadTests.html} (80%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/addmbsubcategorymessage/AddMBSubcategoryMessageTests.java => mbthread/postnewmbsubcategorythread/PostNewMBSubcategoryThreadTests.java} (84%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/addmbsubcategorymessage/ViewMBSubcategoryMessageTest.html => mbthread/postnewmbsubcategorythread/ViewMBSubcategoryThreadTest.html} (94%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/addmbsubcategorymessage/ViewMBSubcategoryMessageTest.java => mbthread/postnewmbsubcategorythread/ViewMBSubcategoryThreadTest.java} (93%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/addmbsubcategorymessagebodynull/AddMBSubcategoryMessageBodyNullTest.html => mbthread/postnewmbsubcategorythreadbodynull/PostNewMBSubcategoryThreadBodyNullTest.html} (96%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/addmbsubcategorymessagebodynull/AddMBSubcategoryMessageBodyNullTest.java => mbthread/postnewmbsubcategorythreadbodynull/PostNewMBSubcategoryThreadBodyNullTest.java} (96%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/addmbsubcategorymessagesubjectnull/AddMBSubcategoryMessageSubjectNullTests.html => mbthread/postnewmbsubcategorythreadbodynull/PostNewMBSubcategoryThreadBodyNullTests.html} (77%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/addmbsubcategorymessagesubjectnull/AddMBSubcategoryMessageSubjectNullTests.java => mbthread/postnewmbsubcategorythreadbodynull/PostNewMBSubcategoryThreadBodyNullTests.java} (82%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/addmbsubcategorymessagemultiple/AddMBSubcategoryMessage1Test.html => mbthread/postnewmbsubcategorythreads/PostNewMBSubcategoryThread1Test.html} (96%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/addmbsubcategorymessagemultiple/AddMBSubcategoryMessage1Test.java => mbthread/postnewmbsubcategorythreads/PostNewMBSubcategoryThread1Test.java} (96%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/addmbsubcategorymessagemultiple/AddMBSubcategoryMessage2Test.html => mbthread/postnewmbsubcategorythreads/PostNewMBSubcategoryThread2Test.html} (96%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/addmbsubcategorymessagemultiple/AddMBSubcategoryMessage2Test.java => mbthread/postnewmbsubcategorythreads/PostNewMBSubcategoryThread2Test.java} (96%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/addmbsubcategorymessagemultiple/AddMBSubcategoryMessage3Test.html => mbthread/postnewmbsubcategorythreads/PostNewMBSubcategoryThread3Test.html} (96%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/addmbsubcategorymessagemultiple/AddMBSubcategoryMessage3Test.java => mbthread/postnewmbsubcategorythreads/PostNewMBSubcategoryThread3Test.java} (96%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/addmbcategorymessagereply/AddMBCategoryMessageReplyTests.html => mbthread/postnewmbsubcategorythreads/PostNewMBSubcategoryThreadsTests.html} (69%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/addmbsubcategorymessagemultiple/AddMBSubcategoryMessageMultipleTests.java => mbthread/postnewmbsubcategorythreads/PostNewMBSubcategoryThreadsTests.java} (77%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/addmbsubcategorymessagesubjectnull/AddMBSubcategoryMessageSubjectNullTest.html => mbthread/postnewmbsubcategorythreadsubjectnull/PostNewMBSubcategoryThreadSubjectNullTest.html} (96%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/addmbsubcategorymessagesubjectnull/AddMBSubcategoryMessageSubjectNullTest.java => mbthread/postnewmbsubcategorythreadsubjectnull/PostNewMBSubcategoryThreadSubjectNullTest.java} (96%)
 create mode 100644 portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbsubcategorythreadsubjectnull/PostNewMBSubcategoryThreadSubjectNullTests.html
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/addmbsubcategorymessagebodynull/AddMBSubcategoryMessageBodyNullTests.java => mbthread/postnewmbsubcategorythreadsubjectnull/PostNewMBSubcategoryThreadSubjectNullTests.java} (81%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/postnewmbthreadmessage/PostNewMBThread1MessageTest.html => mbthread/postnewmbthread/PostNewMBThread1Test.html} (95%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/postnewmbthreadmessage/PostNewMBThread1MessageTest.java => mbthread/postnewmbthread/PostNewMBThread1Test.java} (95%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/postnewmbthreadmessage/PostNewMBThread2MessageTest.html => mbthread/postnewmbthread/PostNewMBThread2Test.html} (95%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/postnewmbthreadmessage/PostNewMBThread2MessageTest.java => mbthread/postnewmbthread/PostNewMBThread2Test.java} (95%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/postnewmbthreadmessage/PostNewMBThread3MessageTest.html => mbthread/postnewmbthread/PostNewMBThread3Test.html} (95%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/postnewmbthreadmessage/PostNewMBThread3MessageTest.java => mbthread/postnewmbthread/PostNewMBThread3Test.java} (95%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/postnewmbthreadmessage/PostNewMBThreadMessageTest.html => mbthread/postnewmbthread/PostNewMBThreadTest.html} (95%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/postnewmbthreadmessage/PostNewMBThreadMessageTest.java => mbthread/postnewmbthread/PostNewMBThreadTest.java} (95%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/postnewmbthreadmessage/PostNewMBThreadMessageTests.html => mbthread/postnewmbthread/PostNewMBThreadTests.html} (84%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/addmbmessage/AddMBMessageTests.java => mbthread/postnewmbthread/PostNewMBThreadTests.java} (81%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/postnewmbthreadmessage => mbthread/postnewmbthread}/TearDownMBThreadTest.html (100%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/postnewmbthreadmessage => mbthread/postnewmbthread}/TearDownMBThreadTest.java (98%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/postnewmbthreadmessage/ViewMBThreadMessageTest.html => mbthread/postnewmbthread/ViewMBThreadTest.html} (93%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/postnewmbthreadmessage/ViewMBThreadMessageTest.java => mbthread/postnewmbthread/ViewMBThreadTest.java} (92%)
 create mode 100644 portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbthreads/PostNewMBThreadsTests.html
 create mode 100644 portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbthreads/PostNewMBThreadsTests.java
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/postnewmbthreadsmessage/ViewMBThread1MessageTest.html => mbthread/postnewmbthreads/ViewMBThread1Test.html} (93%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/postnewmbthreadsmessage/ViewMBThread1MessageTest.java => mbthread/postnewmbthreads/ViewMBThread1Test.java} (92%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/postnewmbthreadsmessage/ViewMBThread2MessageTest.html => mbthread/postnewmbthreads/ViewMBThread2Test.html} (93%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/postnewmbthreadsmessage/ViewMBThread2MessageTest.java => mbthread/postnewmbthreads/ViewMBThread2Test.java} (92%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/postnewmbthreadsmessage/ViewMBThread3MessageTest.html => mbthread/postnewmbthreads/ViewMBThread3Test.html} (93%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/postnewmbthreadsmessage/ViewMBThread3MessageTest.java => mbthread/postnewmbthreads/ViewMBThread3Test.java} (92%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/previewmbthreadmessagedetails/PreviewMBThreadMessageDetailsTest.html => mbthread/previewmbthreaddetails/PreviewMBThreadDetailsTest.html} (96%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/previewmbthreadmessagedetails/PreviewMBThreadMessageDetailsTest.java => mbthread/previewmbthreaddetails/PreviewMBThreadDetailsTest.java} (96%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/addmbmessage/AddMBMessageTests.html => mbthread/previewmbthreaddetails/PreviewMBThreadDetailsTests.html} (79%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/postnewmbthreadmessage/PostNewMBThreadMessageTests.java => mbthread/previewmbthreaddetails/PreviewMBThreadDetailsTests.java} (82%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/previewmbthreadmessagedetails/TearDownMBThreadMessageTest.html => mbthread/previewmbthreaddetails/TearDownMBThreadTest.html} (96%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/previewmbthreadmessagedetails/TearDownMBThreadMessageTest.java => mbthread/previewmbthreaddetails/TearDownMBThreadTest.java} (96%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/previousmbcategorymessage/PreviousMBCategoryMessageTest.html => mbthread/previousmbcategorythread/PreviousMBCategoryThreadTest.html} (92%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/previousmbcategorymessage/PreviousMBCategoryMessageTest.java => mbthread/previousmbcategorythread/PreviousMBCategoryThreadTest.java} (92%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/nextmbcategorymessage/NextMBCategoryMessageTests.html => mbthread/previousmbcategorythread/PreviousMBCategoryThreadTests.html} (69%)
 create mode 100644 portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/previousmbcategorythread/PreviousMBCategoryThreadTests.java
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/ratembcategorymessage/RateMBCategoryMessageTest.html => mbthread/ratembcategorythread/RateMBCategoryThreadTest.html} (97%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/ratembcategorymessage/RateMBCategoryMessageTest.java => mbthread/ratembcategorythread/RateMBCategoryThreadTest.java} (96%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/addmbcategorymessage/AddMBCategoryMessageTests.html => mbthread/ratembcategorythread/RateMBCategoryThreadTests.html} (78%)
 create mode 100644 portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/ratembcategorythread/RateMBCategoryThreadTests.java
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/markasanswermbcategorymessagequestionreply/AddMBCategoryMessageQuestionReplyTest.html => mbthread/replymbcategorythreadquestionreply/ReplyMBCategoryThreadQuestionReplyTest.html} (96%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/unmarkmbcategorymessagequestionreply/AddMBCategoryMessageQuestionReplyTest.java => mbthread/replymbcategorythreadquestionreply/ReplyMBCategoryThreadQuestionReplyTest.java} (96%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/ratembcategorymessage/RateMBCategoryMessageTests.html => mbthread/replymbcategorythreadquestionreply/ReplyMBCategoryThreadQuestionReplyTests.html} (78%)
 create mode 100644 portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbcategorythreadquestionreply/ReplyMBCategoryThreadQuestionReplyTests.java
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/replymbcategorythreadmessagereplies/ReplyMBCategoryThreadMessageRepliesTests.html => mbthread/replymbcategorythreadreplies/ReplyMBCategoryThreadRepliesTests.html} (57%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/postnewmbcategorythreadsmessage/PostNewMBCategoryThreadsMessageTests.java => mbthread/replymbcategorythreadreplies/ReplyMBCategoryThreadRepliesTests.java} (57%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/replymbcategorythreadmessagereplies/ViewMBCategoryThreadMessageReply1Test.html => mbthread/replymbcategorythreadreplies/ViewMBCategoryThreadReply1Test.html} (96%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/replymbcategorythreadmessagereplies/ViewMBCategoryThreadMessageReply1Test.java => mbthread/replymbcategorythreadreplies/ViewMBCategoryThreadReply1Test.java} (94%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/replymbcategorythreadmessagereplies/ViewMBCategoryThreadMessageReply2Test.html => mbthread/replymbcategorythreadreplies/ViewMBCategoryThreadReply2Test.html} (96%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/replymbcategorythreadmessagereplies/ViewMBCategoryThreadMessageReply2Test.java => mbthread/replymbcategorythreadreplies/ViewMBCategoryThreadReply2Test.java} (95%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/replymbcategorythreadmessagereplies/ViewMBCategoryThreadMessageReply3Test.html => mbthread/replymbcategorythreadreplies/ViewMBCategoryThreadReply3Test.html} (97%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/replymbcategorythreadmessagereplies/ViewMBCategoryThreadMessageReply3Test.java => mbthread/replymbcategorythreadreplies/ViewMBCategoryThreadReply3Test.java} (96%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/replymbcategorythreadmessagereply/ReplyMBCategoryThreadMessageReply1Test.html => mbthread/replymbcategorythreadreply/ReplyMBCategoryThreadReply1Test.html} (94%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/replymbcategorythreadmessagereply/ReplyMBCategoryThreadMessageReply1Test.java => mbthread/replymbcategorythreadreply/ReplyMBCategoryThreadReply1Test.java} (94%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/replymbcategorythreadmessagereply/ReplyMBCategoryThreadMessageReply2Test.html => mbthread/replymbcategorythreadreply/ReplyMBCategoryThreadReply2Test.html} (94%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/replymbcategorythreadmessagereply/ReplyMBCategoryThreadMessageReply2Test.java => mbthread/replymbcategorythreadreply/ReplyMBCategoryThreadReply2Test.java} (94%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/replymbcategorythreadmessagereply/ReplyMBCategoryThreadMessageReply3Test.html => mbthread/replymbcategorythreadreply/ReplyMBCategoryThreadReply3Test.html} (94%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/replymbcategorythreadmessagereply/ReplyMBCategoryThreadMessageReply3Test.java => mbthread/replymbcategorythreadreply/ReplyMBCategoryThreadReply3Test.java} (94%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/replymbcategorythreadmessagereply/ReplyMBCategoryThreadMessageReplyTest.html => mbthread/replymbcategorythreadreply/ReplyMBCategoryThreadReplyTest.html} (95%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/replymbcategorythreadmessagereply/ReplyMBCategoryThreadMessageReplyTest.java => mbthread/replymbcategorythreadreply/ReplyMBCategoryThreadReplyTest.java} (94%)
 create mode 100644 portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbcategorythreadreply/ReplyMBCategoryThreadReplyTests.html
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/replymbcategorythreadmessagereply/ReplyMBCategoryThreadMessageReplyTests.java => mbthread/replymbcategorythreadreply/ReplyMBCategoryThreadReplyTests.java} (71%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/replymbcategorythreadmessagereply/ViewMBCategoryThreadMessageReplyTest.html => mbthread/replymbcategorythreadreply/ViewMBCategoryThreadReplyTest.html} (96%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/replymbcategorythreadmessagereply/ViewMBCategoryThreadMessageReplyTest.java => mbthread/replymbcategorythreadreply/ViewMBCategoryThreadReplyTest.java} (94%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/replymbcategorythreadmessagereplyreply/ReplyMBCategoryThreadMessageReplyReplyTest.html => mbthread/replymbcategorythreadreplyreply/ReplyMBCategoryThreadReplyReplyTest.html} (95%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/replymbcategorythreadmessagereplyreply/ReplyMBCategoryThreadMessageReplyReplyTest.java => mbthread/replymbcategorythreadreplyreply/ReplyMBCategoryThreadReplyReplyTest.java} (95%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/splitthreadmbcategorymessagereply/SplitThreadMBCategoryMessageReplyTests.html => mbthread/replymbcategorythreadreplyreply/ReplyMBCategoryThreadReplyReplyTests.html} (69%)
 create mode 100644 portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbcategorythreadreplyreply/ReplyMBCategoryThreadReplyReplyTests.java
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/replymbcategorythreadmessagereplyreply/ViewMBCategoryThreadMessageReplyReplyTest.html => mbthread/replymbcategorythreadreplyreply/ViewMBCategoryThreadReplyReplyTest.html} (96%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/replymbcategorythreadmessagereplyreply/ViewMBCategoryThreadMessageReplyReplyTest.java => mbthread/replymbcategorythreadreplyreply/ViewMBCategoryThreadReplyReplyTest.java} (95%)
 create mode 100644 portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbthreadreplies/ReplyMBThreadRepliesTests.html
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/postnewmbthreadsmessage/PostNewMBThreadsMessageTests.java => mbthread/replymbthreadreplies/ReplyMBThreadRepliesTests.java} (55%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/replymbthreadmessagereplies/ViewMBThreadMessageReply1Test.html => mbthread/replymbthreadreplies/ViewMBThreadReply1Test.html} (92%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/replymbthreadmessagereplies/ViewMBThreadMessageReply1Test.java => mbthread/replymbthreadreplies/ViewMBThreadReply1Test.java} (91%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/replymbthreadmessagereplies/ViewMBThreadMessageReply2Test.html => mbthread/replymbthreadreplies/ViewMBThreadReply2Test.html} (93%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/replymbthreadmessagereplies/ViewMBThreadMessageReply2Test.java => mbthread/replymbthreadreplies/ViewMBThreadReply2Test.java} (92%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/replymbthreadmessagereplies/ViewMBThreadMessageReply3Test.html => mbthread/replymbthreadreplies/ViewMBThreadReply3Test.html} (94%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/replymbthreadmessagereplies/ViewMBThreadMessageReply3Test.java => mbthread/replymbthreadreplies/ViewMBThreadReply3Test.java} (92%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/replymbthreadmessagereply/ReplyMBThreadMessageReply1Test.html => mbthread/replymbthreadreply/ReplyMBThreadReply1Test.html} (95%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/replymbthreadmessagereply/ReplyMBThreadMessageReply1Test.java => mbthread/replymbthreadreply/ReplyMBThreadReply1Test.java} (95%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/replymbthreadmessagereply/ReplyMBThreadMessageReply2Test.html => mbthread/replymbthreadreply/ReplyMBThreadReply2Test.html} (95%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/replymbthreadmessagereply/ReplyMBThreadMessageReply2Test.java => mbthread/replymbthreadreply/ReplyMBThreadReply2Test.java} (95%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/replymbthreadmessagereply/ReplyMBThreadMessageReply3Test.html => mbthread/replymbthreadreply/ReplyMBThreadReply3Test.html} (95%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/replymbthreadmessagereply/ReplyMBThreadMessageReply3Test.java => mbthread/replymbthreadreply/ReplyMBThreadReply3Test.java} (95%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/replymbthreadmessagereply/ReplyMBThreadMessageReplyTest.html => mbthread/replymbthreadreply/ReplyMBThreadReplyTest.html} (95%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/replymbthreadmessagereply/ReplyMBThreadMessageReplyTest.java => mbthread/replymbthreadreply/ReplyMBThreadReplyTest.java} (95%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/replymbthreadmessagereply/ReplyMBThreadMessageReplyTests.html => mbthread/replymbthreadreply/ReplyMBThreadReplyTests.html} (71%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/replymbthreadmessagereply/ReplyMBThreadMessageReplyTests.java => mbthread/replymbthreadreply/ReplyMBThreadReplyTests.java} (69%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/replymbthreadmessagereply/ViewMBThreadMessageReplyTest.html => mbthread/replymbthreadreply/ViewMBThreadReplyTest.html} (96%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/replymbthreadmessagereply/ViewMBThreadMessageReplyTest.java => mbthread/replymbthreadreply/ViewMBThreadReplyTest.java} (94%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/searchmbcategorymessage/SearchMBCategoryMessageQuotesTest.html => mbthread/searchmbcategorythread/SearchMBCategoryThreadQuotesTest.html} (91%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/searchmbcategorymessage/SearchMBCategoryMessageQuotesTest.java => mbthread/searchmbcategorythread/SearchMBCategoryThreadQuotesTest.java} (91%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/searchmbcategorymessage/SearchMBCategoryMessageTest.html => mbthread/searchmbcategorythread/SearchMBCategoryThreadTest.html} (91%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/searchmbcategorymessage/SearchMBCategoryMessageTest.java => mbthread/searchmbcategorythread/SearchMBCategoryThreadTest.java} (92%)
 create mode 100644 portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/searchmbcategorythread/SearchMBCategoryThreadTests.html
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/editmbcategorymessagesubject/EditMBCategoryMessageSubjectTests.java => mbthread/searchmbcategorythread/SearchMBCategoryThreadTests.java} (77%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/splitthreadmbcategorymessagereply/SplitThreadMBCategoryMessageReplyTest.html => mbthread/splitthreadmbcategorythreadreply/SplitThreadMBCategoryThreadReplyTest.html} (94%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/splitthreadmbcategorymessagereply/SplitThreadMBCategoryMessageReplyTest.java => mbthread/splitthreadmbcategorythreadreply/SplitThreadMBCategoryThreadReplyTest.java} (93%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/replymbcategorythreadmessagereplyreply/ReplyMBCategoryThreadMessageReplyReplyTests.html => mbthread/splitthreadmbcategorythreadreply/SplitThreadMBCategoryThreadReplyTests.html} (69%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/editmbcategorymessagesubjectnull/EditMBCategoryMessageSubjectNullTests.java => mbthread/splitthreadmbcategorythreadreply/SplitThreadMBCategoryThreadReplyTests.java} (65%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/splitthreadmbcategorymessagereply/ViewSplitThreadMBCategoryMessageReplyTest.html => mbthread/splitthreadmbcategorythreadreply/ViewSplitThreadMBCategoryThreadReplyTest.html} (95%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/splitthreadmbcategorymessagereply/ViewSplitThreadMBCategoryMessageReplyTest.java => mbthread/splitthreadmbcategorythreadreply/ViewSplitThreadMBCategoryThreadReplyTest.java} (95%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/splitthreadmbcategorymessagereplybackbutton/SplitThreadMBCategoryMessageReplyBackButtonTest.html => mbthread/splitthreadmbcategorythreadreplybackbutton/SplitThreadMBCategoryThreadReplyBackButtonTest.html} (93%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/splitthreadmbcategorymessagereplybackbutton/SplitThreadMBCategoryMessageReplyBackButtonTest.java => mbthread/splitthreadmbcategorythreadreplybackbutton/SplitThreadMBCategoryThreadReplyBackButtonTest.java} (92%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/replymbcategorythreadmessagereply/ReplyMBCategoryThreadMessageReplyTests.html => mbthread/splitthreadmbcategorythreadreplybackbutton/SplitThreadMBCategoryThreadReplyBackButtonTests.html} (74%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/markasanswermbcategorymessagequestionreply/MarkAsAnswerMBCategoryMessageQuestionReplyTests.java => mbthread/splitthreadmbcategorythreadreplybackbutton/SplitThreadMBCategoryThreadReplyBackButtonTests.java} (71%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/splitthreadmbcategorymessagereplyexplanation/SplitThreadMBCategoryMessageReplyExplanationTest.html => mbthread/splitthreadmbcategorythreadreplyexplanation/SplitThreadMBCategoryThreadReplyExplanationTest.html} (95%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/splitthreadmbcategorymessagereplyexplanation/SplitThreadMBCategoryMessageReplyExplanationTest.java => mbthread/splitthreadmbcategorythreadreplyexplanation/SplitThreadMBCategoryThreadReplyExplanationTest.java} (95%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/splitthreadmbcategorymessagereplyexplanation/SplitThreadMBCategoryMessageReplyExplanationTests.html => mbthread/splitthreadmbcategorythreadreplyexplanation/SplitThreadMBCategoryThreadReplyExplanationTests.html} (68%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/splitthreadmbcategorymessagereply/SplitThreadMBCategoryMessageReplyTests.java => mbthread/splitthreadmbcategorythreadreplyexplanation/SplitThreadMBCategoryThreadReplyExplanationTests.java} (65%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/splitthreadmbcategorymessagereplyexplanation/ViewSplitThreadMBCategoryMessageReplyExplanationTest.html => mbthread/splitthreadmbcategorythreadreplyexplanation/ViewSplitThreadMBCategoryThreadReplyExplanationTest.html} (96%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/splitthreadmbcategorymessagereplyexplanation/ViewSplitThreadMBCategoryMessageReplyExplanationTest.java => mbthread/splitthreadmbcategorythreadreplyexplanation/ViewSplitThreadMBCategoryThreadReplyExplanationTest.java} (96%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/splitthreadmbcategorymessagereplyreply/SplitThreadMBCategoryMessageReplyReplyTest.html => mbthread/splitthreadmbcategorythreadreplyreply/SplitThreadMBCategoryThreadReplyReplyTest.html} (95%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/splitthreadmbcategorymessagereplyreply/SplitThreadMBCategoryMessageReplyReplyTest.java => mbthread/splitthreadmbcategorythreadreplyreply/SplitThreadMBCategoryThreadReplyReplyTest.java} (95%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/postnewmbcategorythreadsmessage/PostNewMBCategoryThreadsMessageTests.html => mbthread/splitthreadmbcategorythreadreplyreply/SplitThreadMBCategoryThreadReplyReplyTests.html} (64%)
 create mode 100644 portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/splitthreadmbcategorythreadreplyreply/SplitThreadMBCategoryThreadReplyReplyTests.java
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/splitthreadmbcategorymessagereplyreply/ViewSplitThreadMBCategoryMessageReplyReplyTest.html => mbthread/splitthreadmbcategorythreadreplyreply/ViewSplitThreadMBCategoryThreadReplyReplyTest.html} (96%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/splitthreadmbcategorymessagereplyreply/ViewSplitThreadMBCategoryMessageReplyReplyTest.java => mbthread/splitthreadmbcategorythreadreplyreply/ViewSplitThreadMBCategoryThreadReplyReplyTest.java} (96%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/unmarkmbcategorymessagequestionreply/UnmarkMBCategoryMessageQuestionReplyTest.html => mbthread/unmarkmbcategorythreadquestionreply/UnmarkMBCategoryThreadQuestionReplyTest.html} (93%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/unmarkmbcategorymessagequestionreply/UnmarkMBCategoryMessageQuestionReplyTest.java => mbthread/unmarkmbcategorythreadquestionreply/UnmarkMBCategoryThreadQuestionReplyTest.java} (94%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/previousmbcategorymessage/PreviousMBCategoryMessageTests.html => mbthread/unmarkmbcategorythreadquestionreply/UnmarkMBCategoryThreadQuestionReplyTests.html} (68%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/nextmbcategorymessage/NextMBCategoryMessageTests.java => mbthread/unmarkmbcategorythreadquestionreply/UnmarkMBCategoryThreadQuestionReplyTests.java} (63%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/viewmbcategorymessagemyposts/ViewMBCategoryMessageMyPostsTest.html => mbthread/viewmbcategorythreadmyposts/ViewMBCategoryThreadMyPostsTest.html} (87%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/viewmbcategorymessagemyposts/ViewMBCategoryMessageMyPostsTest.java => mbthread/viewmbcategorythreadmyposts/ViewMBCategoryThreadMyPostsTest.java} (88%)
 create mode 100644 portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/viewmbcategorythreadmyposts/ViewMBCategoryThreadMyPostsTests.html
 create mode 100644 portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/viewmbcategorythreadmyposts/ViewMBCategoryThreadMyPostsTests.java
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/viewmbcategorymessagepostcount/AddMBCategoryMessage1Reply1Test.html => mbthread/viewmbcategorythreadpostcount/ReplyMBCategoryThread1Reply1Test.html} (95%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/viewmbcategorymessagepostcount/AddMBCategoryMessage1Reply1Test.java => mbthread/viewmbcategorythreadpostcount/ReplyMBCategoryThread1Reply1Test.java} (95%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/viewmbcategorymessagepostcount/AddMBCategoryMessage1Reply2Test.html => mbthread/viewmbcategorythreadpostcount/ReplyMBCategoryThread1Reply2Test.html} (96%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/viewmbcategorymessagepostcount/AddMBCategoryMessage1Reply2Test.java => mbthread/viewmbcategorythreadpostcount/ReplyMBCategoryThread1Reply2Test.java} (96%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/viewmbcategorymessagepostcount/AddMBCategoryMessage1Reply3Test.html => mbthread/viewmbcategorythreadpostcount/ReplyMBCategoryThread1Reply3Test.html} (96%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/viewmbcategorymessagepostcount/AddMBCategoryMessage1Reply3Test.java => mbthread/viewmbcategorythreadpostcount/ReplyMBCategoryThread1Reply3Test.java} (96%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/viewmbcategorymessagepostcount/ViewMBCategoryMessagePostCountTest.html => mbthread/viewmbcategorythreadpostcount/ViewMBCategoryThreadPostCountTest.html} (97%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/viewmbcategorymessagepostcount/ViewMBCategoryMessagePostCountTest.java => mbthread/viewmbcategorythreadpostcount/ViewMBCategoryThreadPostCountTest.java} (97%)
 create mode 100644 portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/viewmbcategorythreadpostcount/ViewMBCategoryThreadPostCountTests.html
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/editmbcategorymessagebodynull/EditMBCategoryMessageBodyNullTests.java => mbthread/viewmbcategorythreadpostcount/ViewMBCategoryThreadPostCountTests.java} (61%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/viewmbcategorymessagerecentposts/ViewMBCategoryMessageRecentPostsTest.html => mbthread/viewmbcategorythreadrecentposts/ViewMBCategoryThreadRecentPostsTest.html} (87%)
 rename portal-web/test/com/liferay/portalweb/portlet/messageboards/{mbmessage/viewmbcategorymessagerecentposts/ViewMBCategoryMessageRecentPostsTest.java => mbthread/viewmbcategorythreadrecentposts/ViewMBCategoryThreadRecentPostsTest.java} (88%)
 create mode 100644 portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/viewmbcategorythreadrecentposts/ViewMBCategoryThreadRecentPostsTests.html
 create mode 100644 portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/viewmbcategorythreadrecentposts/ViewMBCategoryThreadRecentPostsTests.java

diff --git a/portal-web/test/com/liferay/portalweb/portlet/assetpublisher/mbthreadmessage/viewmbcategorythreadmessageviewcountap/ViewMBCategoryThreadMessageViewCountAPTests.html b/portal-web/test/com/liferay/portalweb/portlet/assetpublisher/mbthreadmessage/viewmbcategorythreadmessageviewcountap/ViewMBCategoryThreadMessageViewCountAPTests.html
index 0fc07c7ca72a11..f497875990c409 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/assetpublisher/mbthreadmessage/viewmbcategorythreadmessageviewcountap/ViewMBCategoryThreadMessageViewCountAPTests.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/assetpublisher/mbthreadmessage/viewmbcategorythreadmessageviewcountap/ViewMBCategoryThreadMessageViewCountAPTests.html
@@ -13,11 +13,11 @@
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPageMBTest.html">AddPageMBTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPortletMBTest.html">AddPortletMBTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/AddMBCategoryTest.html">AddMBCategoryTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThreadMessageTest.html">PostNewMBCategoryThreadMessageTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategoryThreadTest.html">PostNewMBCategoryThreadTest</a></td></tr>
 <tr><td><a href="ConfigurePortletDisplayStyleFullContentTest.html">ConfigurePortletDisplayStyleFullContentTest</a></td></tr>
 <tr><td><a href="ConfigurePortletShowMetadataViewCountTest.html">ConfigurePortletShowMetadataViewCountTest</a></td></tr>
 <tr><td><a href="ViewMBCategoryThreadMessageViewCountAPTest.html">ViewMBCategoryThreadMessageViewCountAPTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/postnewmbthreadmessage/TearDownMBThreadTest.html">TearDownMBThreadTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/postnewmbthread/TearDownMBThreadTest.html">TearDownMBThreadTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portal/util/TearDownPageTest.html">TearDownPageTest</a></td></tr>
 </tbody></table>
 </body>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/assetpublisher/mbthreadmessage/viewmbcategorythreadmessageviewcountap/ViewMBCategoryThreadMessageViewCountAPTests.java b/portal-web/test/com/liferay/portalweb/portlet/assetpublisher/mbthreadmessage/viewmbcategorythreadmessageviewcountap/ViewMBCategoryThreadMessageViewCountAPTests.java
index a6323b39a2eb8a..e4dbd8606c4b9e 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/assetpublisher/mbthreadmessage/viewmbcategorythreadmessageviewcountap/ViewMBCategoryThreadMessageViewCountAPTests.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/assetpublisher/mbthreadmessage/viewmbcategorythreadmessageviewcountap/ViewMBCategoryThreadMessageViewCountAPTests.java
@@ -19,8 +19,8 @@
 import com.liferay.portalweb.portlet.assetpublisher.portlet.addportletap.AddPageAPTest;
 import com.liferay.portalweb.portlet.assetpublisher.portlet.addportletap.AddPortletAPTest;
 import com.liferay.portalweb.portlet.messageboards.mbcategory.addmbcategory.AddMBCategoryTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbcategorythreadmessage.PostNewMBCategoryThreadMessageTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbthreadmessage.TearDownMBThreadTest;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbcategorythread.PostNewMBCategoryThreadTest;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbthread.TearDownMBThreadTest;
 import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPageMBTest;
 import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPortletMBTest;
 
@@ -38,7 +38,7 @@ public static Test suite() {
 		testSuite.addTestSuite(AddPageMBTest.class);
 		testSuite.addTestSuite(AddPortletMBTest.class);
 		testSuite.addTestSuite(AddMBCategoryTest.class);
-		testSuite.addTestSuite(PostNewMBCategoryThreadMessageTest.class);
+		testSuite.addTestSuite(PostNewMBCategoryThreadTest.class);
 		testSuite.addTestSuite(ConfigurePortletDisplayStyleFullContentTest.class);
 		testSuite.addTestSuite(ConfigurePortletShowMetadataViewCountTest.class);
 		testSuite.addTestSuite(ViewMBCategoryThreadMessageViewCountAPTest.class);
diff --git a/portal-web/test/com/liferay/portalweb/portlet/assetpublisher/mbthreadmessage/viewportletabstractsmbcategorythreadmessageap/ViewPortletAbstractsMBCategoryThreadMessageAPTests.html b/portal-web/test/com/liferay/portalweb/portlet/assetpublisher/mbthreadmessage/viewportletabstractsmbcategorythreadmessageap/ViewPortletAbstractsMBCategoryThreadMessageAPTests.html
index 6ab8eea86dd7b0..4e6534f32028c6 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/assetpublisher/mbthreadmessage/viewportletabstractsmbcategorythreadmessageap/ViewPortletAbstractsMBCategoryThreadMessageAPTests.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/assetpublisher/mbthreadmessage/viewportletabstractsmbcategorythreadmessageap/ViewPortletAbstractsMBCategoryThreadMessageAPTests.html
@@ -13,10 +13,10 @@
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPageMBTest.html">AddPageMBTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPortletMBTest.html">AddPortletMBTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/AddMBCategoryTest.html">AddMBCategoryTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThreadMessageTest.html">PostNewMBCategoryThreadMessageTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategoryThreadTest.html">PostNewMBCategoryThreadTest</a></td></tr>
 <tr><td><a href="ConfigurePortletDisplayStyleAbstractsTest.html">ConfigurePortletDisplayStyleAbstractsTest</a></td></tr>
 <tr><td><a href="ViewPortletAbstractsMBCategoryThreadMessageAPTest.html">ViewPortletAbstractsMBCategoryThreadMessageAPTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/postnewmbthreadmessage/TearDownMBThreadTest.html">TearDownMBThreadTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/postnewmbthread/TearDownMBThreadTest.html">TearDownMBThreadTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portal/util/TearDownPageTest.html">TearDownPageTest</a></td></tr>
 </tbody></table>
 </body>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/assetpublisher/mbthreadmessage/viewportletabstractsmbcategorythreadmessageap/ViewPortletAbstractsMBCategoryThreadMessageAPTests.java b/portal-web/test/com/liferay/portalweb/portlet/assetpublisher/mbthreadmessage/viewportletabstractsmbcategorythreadmessageap/ViewPortletAbstractsMBCategoryThreadMessageAPTests.java
index 5e86a805b4b1ea..da58b84389e13c 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/assetpublisher/mbthreadmessage/viewportletabstractsmbcategorythreadmessageap/ViewPortletAbstractsMBCategoryThreadMessageAPTests.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/assetpublisher/mbthreadmessage/viewportletabstractsmbcategorythreadmessageap/ViewPortletAbstractsMBCategoryThreadMessageAPTests.java
@@ -19,8 +19,8 @@
 import com.liferay.portalweb.portlet.assetpublisher.portlet.addportletap.AddPageAPTest;
 import com.liferay.portalweb.portlet.assetpublisher.portlet.addportletap.AddPortletAPTest;
 import com.liferay.portalweb.portlet.messageboards.mbcategory.addmbcategory.AddMBCategoryTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbcategorythreadmessage.PostNewMBCategoryThreadMessageTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbthreadmessage.TearDownMBThreadTest;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbcategorythread.PostNewMBCategoryThreadTest;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbthread.TearDownMBThreadTest;
 import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPageMBTest;
 import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPortletMBTest;
 
@@ -39,7 +39,7 @@ public static Test suite() {
 		testSuite.addTestSuite(AddPageMBTest.class);
 		testSuite.addTestSuite(AddPortletMBTest.class);
 		testSuite.addTestSuite(AddMBCategoryTest.class);
-		testSuite.addTestSuite(PostNewMBCategoryThreadMessageTest.class);
+		testSuite.addTestSuite(PostNewMBCategoryThreadTest.class);
 		testSuite.addTestSuite(ConfigurePortletDisplayStyleAbstractsTest.class);
 		testSuite.addTestSuite(ViewPortletAbstractsMBCategoryThreadMessageAPTest.class);
 		testSuite.addTestSuite(TearDownMBThreadTest.class);
diff --git a/portal-web/test/com/liferay/portalweb/portlet/assetpublisher/mbthreadmessage/viewportletavailablembcategorythreadmessageap/ViewPortletAvailableMBCategoryThreadMessageAPTests.html b/portal-web/test/com/liferay/portalweb/portlet/assetpublisher/mbthreadmessage/viewportletavailablembcategorythreadmessageap/ViewPortletAvailableMBCategoryThreadMessageAPTests.html
index af944cd0bf859f..f554f7adc2a223 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/assetpublisher/mbthreadmessage/viewportletavailablembcategorythreadmessageap/ViewPortletAvailableMBCategoryThreadMessageAPTests.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/assetpublisher/mbthreadmessage/viewportletavailablembcategorythreadmessageap/ViewPortletAvailableMBCategoryThreadMessageAPTests.html
@@ -13,10 +13,10 @@
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPageMBTest.html">AddPageMBTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPortletMBTest.html">AddPortletMBTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/AddMBCategoryTest.html">AddMBCategoryTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThreadMessageTest.html">PostNewMBCategoryThreadMessageTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategoryThreadTest.html">PostNewMBCategoryThreadTest</a></td></tr>
 <tr><td><a href="ConfigurePortletAvailableMBMessageTest.html">ConfigurePortletAvailableMBMessageTest</a></td></tr>
 <tr><td><a href="ViewPortletAvailableMBCategoryThreadMessageAPTest.html">ViewPortletAvailableMBCategoryThreadMessageAPTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/postnewmbthreadmessage/TearDownMBThreadTest.html">TearDownMBThreadTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/postnewmbthread/TearDownMBThreadTest.html">TearDownMBThreadTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portal/util/TearDownPageTest.html">TearDownPageTest</a></td></tr>
 </tbody></table>
 </body>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/assetpublisher/mbthreadmessage/viewportletavailablembcategorythreadmessageap/ViewPortletAvailableMBCategoryThreadMessageAPTests.java b/portal-web/test/com/liferay/portalweb/portlet/assetpublisher/mbthreadmessage/viewportletavailablembcategorythreadmessageap/ViewPortletAvailableMBCategoryThreadMessageAPTests.java
index 232e0ba89835e0..9acf12e0cf8ead 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/assetpublisher/mbthreadmessage/viewportletavailablembcategorythreadmessageap/ViewPortletAvailableMBCategoryThreadMessageAPTests.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/assetpublisher/mbthreadmessage/viewportletavailablembcategorythreadmessageap/ViewPortletAvailableMBCategoryThreadMessageAPTests.java
@@ -19,8 +19,8 @@
 import com.liferay.portalweb.portlet.assetpublisher.portlet.addportletap.AddPageAPTest;
 import com.liferay.portalweb.portlet.assetpublisher.portlet.addportletap.AddPortletAPTest;
 import com.liferay.portalweb.portlet.messageboards.mbcategory.addmbcategory.AddMBCategoryTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbcategorythreadmessage.PostNewMBCategoryThreadMessageTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbthreadmessage.TearDownMBThreadTest;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbcategorythread.PostNewMBCategoryThreadTest;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbthread.TearDownMBThreadTest;
 import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPageMBTest;
 import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPortletMBTest;
 
@@ -39,7 +39,7 @@ public static Test suite() {
 		testSuite.addTestSuite(AddPageMBTest.class);
 		testSuite.addTestSuite(AddPortletMBTest.class);
 		testSuite.addTestSuite(AddMBCategoryTest.class);
-		testSuite.addTestSuite(PostNewMBCategoryThreadMessageTest.class);
+		testSuite.addTestSuite(PostNewMBCategoryThreadTest.class);
 		testSuite.addTestSuite(ConfigurePortletAvailableMBMessageTest.class);
 		testSuite.addTestSuite(ViewPortletAvailableMBCategoryThreadMessageAPTest.class);
 		testSuite.addTestSuite(TearDownMBThreadTest.class);
diff --git a/portal-web/test/com/liferay/portalweb/portlet/assetpublisher/mbthreadmessage/viewportletcurrentmbcategorythreadmessageap/ViewPortletCurrentMBCategoryThreadMessageAPTests.html b/portal-web/test/com/liferay/portalweb/portlet/assetpublisher/mbthreadmessage/viewportletcurrentmbcategorythreadmessageap/ViewPortletCurrentMBCategoryThreadMessageAPTests.html
index ad899cae774049..b964ef8e1808b9 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/assetpublisher/mbthreadmessage/viewportletcurrentmbcategorythreadmessageap/ViewPortletCurrentMBCategoryThreadMessageAPTests.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/assetpublisher/mbthreadmessage/viewportletcurrentmbcategorythreadmessageap/ViewPortletCurrentMBCategoryThreadMessageAPTests.html
@@ -13,12 +13,12 @@
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPageMBTest.html">AddPageMBTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPortletMBTest.html">AddPortletMBTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/AddMBCategoryTest.html">AddMBCategoryTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThreadMessageTest.html">PostNewMBCategoryThreadMessageTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategoryThreadTest.html">PostNewMBCategoryThreadTest</a></td></tr>
 <tr><td><a href="ConfigurePortletAvailableMBMessageTest.html">ConfigurePortletAvailableMBMessageTest</a></td></tr>
 <tr><td><a href="ViewPortletAvailableMBCategoryThreadMessageAPTest.html">ViewPortletAvailableMBCategoryThreadMessageAPTest</a></td></tr>
 <tr><td><a href="ConfigurePortletCurrentMBMessageTest.html">ConfigurePortletCurrentMBMessageTest</a></td></tr>
 <tr><td><a href="ViewPortletCurrentMBCategoryThreadMessageAPTest.html">ViewPortletCurrentMBCategoryThreadMessageAPTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/postnewmbthreadmessage/TearDownMBThreadTest.html">TearDownMBThreadTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/postnewmbthread/TearDownMBThreadTest.html">TearDownMBThreadTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portal/util/TearDownPageTest.html">TearDownPageTest</a></td></tr>
 </tbody></table>
 </body>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/assetpublisher/mbthreadmessage/viewportletcurrentmbcategorythreadmessageap/ViewPortletCurrentMBCategoryThreadMessageAPTests.java b/portal-web/test/com/liferay/portalweb/portlet/assetpublisher/mbthreadmessage/viewportletcurrentmbcategorythreadmessageap/ViewPortletCurrentMBCategoryThreadMessageAPTests.java
index 98c0302fbb0b52..8f78c6a56bd233 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/assetpublisher/mbthreadmessage/viewportletcurrentmbcategorythreadmessageap/ViewPortletCurrentMBCategoryThreadMessageAPTests.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/assetpublisher/mbthreadmessage/viewportletcurrentmbcategorythreadmessageap/ViewPortletCurrentMBCategoryThreadMessageAPTests.java
@@ -19,8 +19,8 @@
 import com.liferay.portalweb.portlet.assetpublisher.portlet.addportletap.AddPageAPTest;
 import com.liferay.portalweb.portlet.assetpublisher.portlet.addportletap.AddPortletAPTest;
 import com.liferay.portalweb.portlet.messageboards.mbcategory.addmbcategory.AddMBCategoryTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbcategorythreadmessage.PostNewMBCategoryThreadMessageTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbthreadmessage.TearDownMBThreadTest;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbcategorythread.PostNewMBCategoryThreadTest;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbthread.TearDownMBThreadTest;
 import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPageMBTest;
 import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPortletMBTest;
 
@@ -39,7 +39,7 @@ public static Test suite() {
 		testSuite.addTestSuite(AddPageMBTest.class);
 		testSuite.addTestSuite(AddPortletMBTest.class);
 		testSuite.addTestSuite(AddMBCategoryTest.class);
-		testSuite.addTestSuite(PostNewMBCategoryThreadMessageTest.class);
+		testSuite.addTestSuite(PostNewMBCategoryThreadTest.class);
 		testSuite.addTestSuite(ConfigurePortletAvailableMBMessageTest.class);
 		testSuite.addTestSuite(ViewPortletAvailableMBCategoryThreadMessageAPTest.class);
 		testSuite.addTestSuite(ConfigurePortletCurrentMBMessageTest.class);
diff --git a/portal-web/test/com/liferay/portalweb/portlet/assetpublisher/mbthreadmessage/viewportletfullcontentmbcategorythreadmessageap/ViewPortletFullContentMBCategoryThreadMessageAPTests.html b/portal-web/test/com/liferay/portalweb/portlet/assetpublisher/mbthreadmessage/viewportletfullcontentmbcategorythreadmessageap/ViewPortletFullContentMBCategoryThreadMessageAPTests.html
index 545a3bd557c201..ca0d98d4773ff1 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/assetpublisher/mbthreadmessage/viewportletfullcontentmbcategorythreadmessageap/ViewPortletFullContentMBCategoryThreadMessageAPTests.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/assetpublisher/mbthreadmessage/viewportletfullcontentmbcategorythreadmessageap/ViewPortletFullContentMBCategoryThreadMessageAPTests.html
@@ -13,10 +13,10 @@
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPageMBTest.html">AddPageMBTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPortletMBTest.html">AddPortletMBTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/AddMBCategoryTest.html">AddMBCategoryTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThreadMessageTest.html">PostNewMBCategoryThreadMessageTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategoryThreadTest.html">PostNewMBCategoryThreadTest</a></td></tr>
 <tr><td><a href="ConfigurePortletDisplayStyleFullContentTest.html">ConfigurePortletDisplayStyleFullContentTest</a></td></tr>
 <tr><td><a href="ViewPortletFullContentMBCategoryThreadMessageAPTest.html">ViewPortletFullContentMBCategoryThreadMessageAPTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/postnewmbthreadmessage/TearDownMBThreadTest.html">TearDownMBThreadTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/postnewmbthread/TearDownMBThreadTest.html">TearDownMBThreadTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portal/util/TearDownPageTest.html">TearDownPageTest</a></td></tr>
 </tbody></table>
 </body>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/assetpublisher/mbthreadmessage/viewportletfullcontentmbcategorythreadmessageap/ViewPortletFullContentMBCategoryThreadMessageAPTests.java b/portal-web/test/com/liferay/portalweb/portlet/assetpublisher/mbthreadmessage/viewportletfullcontentmbcategorythreadmessageap/ViewPortletFullContentMBCategoryThreadMessageAPTests.java
index 39c83dc367f947..453577c504a63e 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/assetpublisher/mbthreadmessage/viewportletfullcontentmbcategorythreadmessageap/ViewPortletFullContentMBCategoryThreadMessageAPTests.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/assetpublisher/mbthreadmessage/viewportletfullcontentmbcategorythreadmessageap/ViewPortletFullContentMBCategoryThreadMessageAPTests.java
@@ -19,8 +19,8 @@
 import com.liferay.portalweb.portlet.assetpublisher.portlet.addportletap.AddPageAPTest;
 import com.liferay.portalweb.portlet.assetpublisher.portlet.addportletap.AddPortletAPTest;
 import com.liferay.portalweb.portlet.messageboards.mbcategory.addmbcategory.AddMBCategoryTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbcategorythreadmessage.PostNewMBCategoryThreadMessageTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbthreadmessage.TearDownMBThreadTest;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbcategorythread.PostNewMBCategoryThreadTest;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbthread.TearDownMBThreadTest;
 import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPageMBTest;
 import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPortletMBTest;
 
@@ -39,7 +39,7 @@ public static Test suite() {
 		testSuite.addTestSuite(AddPageMBTest.class);
 		testSuite.addTestSuite(AddPortletMBTest.class);
 		testSuite.addTestSuite(AddMBCategoryTest.class);
-		testSuite.addTestSuite(PostNewMBCategoryThreadMessageTest.class);
+		testSuite.addTestSuite(PostNewMBCategoryThreadTest.class);
 		testSuite.addTestSuite(ConfigurePortletDisplayStyleFullContentTest.class);
 		testSuite.addTestSuite(ViewPortletFullContentMBCategoryThreadMessageAPTest.class);
 		testSuite.addTestSuite(TearDownMBThreadTest.class);
diff --git a/portal-web/test/com/liferay/portalweb/portlet/assetpublisher/mbthreadmessage/viewportletmaximumitems5mbcategorymessage6ap/ViewPortletMaximumItems5MBCategoryMessage6APTests.html b/portal-web/test/com/liferay/portalweb/portlet/assetpublisher/mbthreadmessage/viewportletmaximumitems5mbcategorymessage6ap/ViewPortletMaximumItems5MBCategoryMessage6APTests.html
index 54d016b0337c0f..e2eee9dc9c0d11 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/assetpublisher/mbthreadmessage/viewportletmaximumitems5mbcategorymessage6ap/ViewPortletMaximumItems5MBCategoryMessage6APTests.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/assetpublisher/mbthreadmessage/viewportletmaximumitems5mbcategorymessage6ap/ViewPortletMaximumItems5MBCategoryMessage6APTests.html
@@ -13,16 +13,16 @@
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPageMBTest.html">AddPageMBTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPortletMBTest.html">AddPortletMBTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/AddMBCategoryTest.html">AddMBCategoryTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThread1MessageTest.html">PostNewMBCategoryThread1MessageTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThread2MessageTest.html">PostNewMBCategoryThread2MessageTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThread3MessageTest.html">PostNewMBCategoryThread3MessageTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThread4MessageTest.html">PostNewMBCategoryThread4MessageTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThread5MessageTest.html">PostNewMBCategoryThread5MessageTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThread6MessageTest.html">PostNewMBCategoryThread6MessageTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategoryThread1Test.html">PostNewMBCategoryThread1Test</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategoryThread2Test.html">PostNewMBCategoryThread2Test</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategoryThread3Test.html">PostNewMBCategoryThread3Test</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategoryThread4Test.html">PostNewMBCategoryThread4Test</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategoryThread5Test.html">PostNewMBCategoryThread5Test</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategoryThread6Test.html">PostNewMBCategoryThread6Test</a></td></tr>
 <tr><td><a href="ViewMBCategoryThreadMessage6APTest.html">ViewMBCategoryThreadMessage6APTest</a></td></tr>
 <tr><td><a href="ConfigurePortletMaximumItemsToDisplay5Test.html">ConfigurePortletMaximumItemsToDisplay5Test</a></td></tr>
 <tr><td><a href="ViewPortletMaximumItems5MBCategoryMessage6APTest.html">ViewPortletMaximumItems5MBCategoryMessage6APTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/postnewmbthreadmessage/TearDownMBThreadTest.html">TearDownMBThreadTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/postnewmbthread/TearDownMBThreadTest.html">TearDownMBThreadTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portal/util/TearDownPageTest.html">TearDownPageTest</a></td></tr>
 </tbody></table>
 </body>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/assetpublisher/mbthreadmessage/viewportletmaximumitems5mbcategorymessage6ap/ViewPortletMaximumItems5MBCategoryMessage6APTests.java b/portal-web/test/com/liferay/portalweb/portlet/assetpublisher/mbthreadmessage/viewportletmaximumitems5mbcategorymessage6ap/ViewPortletMaximumItems5MBCategoryMessage6APTests.java
index 275f4271304ebb..0c9d10df7192ef 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/assetpublisher/mbthreadmessage/viewportletmaximumitems5mbcategorymessage6ap/ViewPortletMaximumItems5MBCategoryMessage6APTests.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/assetpublisher/mbthreadmessage/viewportletmaximumitems5mbcategorymessage6ap/ViewPortletMaximumItems5MBCategoryMessage6APTests.java
@@ -19,13 +19,13 @@
 import com.liferay.portalweb.portlet.assetpublisher.portlet.addportletap.AddPageAPTest;
 import com.liferay.portalweb.portlet.assetpublisher.portlet.addportletap.AddPortletAPTest;
 import com.liferay.portalweb.portlet.messageboards.mbcategory.addmbcategory.AddMBCategoryTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbcategorythreadmessage.PostNewMBCategoryThread1MessageTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbcategorythreadmessage.PostNewMBCategoryThread2MessageTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbcategorythreadmessage.PostNewMBCategoryThread3MessageTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbcategorythreadmessage.PostNewMBCategoryThread4MessageTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbcategorythreadmessage.PostNewMBCategoryThread5MessageTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbcategorythreadmessage.PostNewMBCategoryThread6MessageTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbthreadmessage.TearDownMBThreadTest;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbcategorythread.PostNewMBCategoryThread1Test;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbcategorythread.PostNewMBCategoryThread2Test;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbcategorythread.PostNewMBCategoryThread3Test;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbcategorythread.PostNewMBCategoryThread4Test;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbcategorythread.PostNewMBCategoryThread5Test;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbcategorythread.PostNewMBCategoryThread6Test;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbthread.TearDownMBThreadTest;
 import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPageMBTest;
 import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPortletMBTest;
 
@@ -44,12 +44,12 @@ public static Test suite() {
 		testSuite.addTestSuite(AddPageMBTest.class);
 		testSuite.addTestSuite(AddPortletMBTest.class);
 		testSuite.addTestSuite(AddMBCategoryTest.class);
-		testSuite.addTestSuite(PostNewMBCategoryThread1MessageTest.class);
-		testSuite.addTestSuite(PostNewMBCategoryThread2MessageTest.class);
-		testSuite.addTestSuite(PostNewMBCategoryThread3MessageTest.class);
-		testSuite.addTestSuite(PostNewMBCategoryThread4MessageTest.class);
-		testSuite.addTestSuite(PostNewMBCategoryThread5MessageTest.class);
-		testSuite.addTestSuite(PostNewMBCategoryThread6MessageTest.class);
+		testSuite.addTestSuite(PostNewMBCategoryThread1Test.class);
+		testSuite.addTestSuite(PostNewMBCategoryThread2Test.class);
+		testSuite.addTestSuite(PostNewMBCategoryThread3Test.class);
+		testSuite.addTestSuite(PostNewMBCategoryThread4Test.class);
+		testSuite.addTestSuite(PostNewMBCategoryThread5Test.class);
+		testSuite.addTestSuite(PostNewMBCategoryThread6Test.class);
 		testSuite.addTestSuite(ViewMBCategoryThreadMessage6APTest.class);
 		testSuite.addTestSuite(ConfigurePortletMaximumItemsToDisplay5Test.class);
 		testSuite.addTestSuite(ViewPortletMaximumItems5MBCategoryMessage6APTest.class);
diff --git a/portal-web/test/com/liferay/portalweb/portlet/assetpublisher/mbthreadmessage/viewportletpaginationregularmbcategorythread6ap/ViewPortletPaginationRegularMBCategoryThread6APTests.html b/portal-web/test/com/liferay/portalweb/portlet/assetpublisher/mbthreadmessage/viewportletpaginationregularmbcategorythread6ap/ViewPortletPaginationRegularMBCategoryThread6APTests.html
index 2dbe958833d231..e7ca867fb4499e 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/assetpublisher/mbthreadmessage/viewportletpaginationregularmbcategorythread6ap/ViewPortletPaginationRegularMBCategoryThread6APTests.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/assetpublisher/mbthreadmessage/viewportletpaginationregularmbcategorythread6ap/ViewPortletPaginationRegularMBCategoryThread6APTests.html
@@ -13,12 +13,12 @@
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPageMBTest.html">AddPageMBTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPortletMBTest.html">AddPortletMBTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/AddMBCategoryTest.html">AddMBCategoryTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThread1MessageTest.html">PostNewMBCategoryThread1MessageTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThread2MessageTest.html">PostNewMBCategoryThread2MessageTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThread3MessageTest.html">PostNewMBCategoryThread3MessageTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThread4MessageTest.html">PostNewMBCategoryThread4MessageTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThread5MessageTest.html">PostNewMBCategoryThread5MessageTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThread6MessageTest.html">PostNewMBCategoryThread6MessageTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategoryThread1Test.html">PostNewMBCategoryThread1Test</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategoryThread2Test.html">PostNewMBCategoryThread2Test</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategoryThread3Test.html">PostNewMBCategoryThread3Test</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategoryThread4Test.html">PostNewMBCategoryThread4Test</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategoryThread5Test.html">PostNewMBCategoryThread5Test</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategoryThread6Test.html">PostNewMBCategoryThread6Test</a></td></tr>
 <tr><td><a href="ConfigurePortletMaximumItemsToDisplay2Test.html">ConfigurePortletMaximumItemsToDisplay2Test</a></td></tr>
 <tr><td><a href="ConfigurePortletPaginationTypeRegularTest.html">ConfigurePortletPaginationTypeRegularTest</a></td></tr>
 <tr><td><a href="FirstButtonAPTest.html">FirstButtonAPTest</a></td></tr>
@@ -26,7 +26,7 @@
 <tr><td><a href="NextButtonAPTest.html">NextButtonAPTest</a></td></tr>
 <tr><td><a href="PreviousButtonAPTest.html">PreviousButtonAPTest</a></td></tr>
 <tr><td><a href="SelectPageAPTest.html">SelectPageAPTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/postnewmbthreadmessage/TearDownMBThreadTest.html">TearDownMBThreadTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/postnewmbthread/TearDownMBThreadTest.html">TearDownMBThreadTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portal/util/TearDownPageTest.html">TearDownPageTest</a></td></tr>
 </tbody></table>
 </body>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/assetpublisher/mbthreadmessage/viewportletpaginationregularmbcategorythread6ap/ViewPortletPaginationRegularMBCategoryThread6APTests.java b/portal-web/test/com/liferay/portalweb/portlet/assetpublisher/mbthreadmessage/viewportletpaginationregularmbcategorythread6ap/ViewPortletPaginationRegularMBCategoryThread6APTests.java
index 4ec67d15a45c05..762006451bcbea 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/assetpublisher/mbthreadmessage/viewportletpaginationregularmbcategorythread6ap/ViewPortletPaginationRegularMBCategoryThread6APTests.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/assetpublisher/mbthreadmessage/viewportletpaginationregularmbcategorythread6ap/ViewPortletPaginationRegularMBCategoryThread6APTests.java
@@ -19,13 +19,13 @@
 import com.liferay.portalweb.portlet.assetpublisher.portlet.addportletap.AddPageAPTest;
 import com.liferay.portalweb.portlet.assetpublisher.portlet.addportletap.AddPortletAPTest;
 import com.liferay.portalweb.portlet.messageboards.mbcategory.addmbcategory.AddMBCategoryTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbcategorythreadmessage.PostNewMBCategoryThread1MessageTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbcategorythreadmessage.PostNewMBCategoryThread2MessageTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbcategorythreadmessage.PostNewMBCategoryThread3MessageTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbcategorythreadmessage.PostNewMBCategoryThread4MessageTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbcategorythreadmessage.PostNewMBCategoryThread5MessageTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbcategorythreadmessage.PostNewMBCategoryThread6MessageTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbthreadmessage.TearDownMBThreadTest;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbcategorythread.PostNewMBCategoryThread1Test;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbcategorythread.PostNewMBCategoryThread2Test;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbcategorythread.PostNewMBCategoryThread3Test;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbcategorythread.PostNewMBCategoryThread4Test;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbcategorythread.PostNewMBCategoryThread5Test;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbcategorythread.PostNewMBCategoryThread6Test;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbthread.TearDownMBThreadTest;
 import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPageMBTest;
 import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPortletMBTest;
 
@@ -44,12 +44,12 @@ public static Test suite() {
 		testSuite.addTestSuite(AddPageMBTest.class);
 		testSuite.addTestSuite(AddPortletMBTest.class);
 		testSuite.addTestSuite(AddMBCategoryTest.class);
-		testSuite.addTestSuite(PostNewMBCategoryThread1MessageTest.class);
-		testSuite.addTestSuite(PostNewMBCategoryThread2MessageTest.class);
-		testSuite.addTestSuite(PostNewMBCategoryThread3MessageTest.class);
-		testSuite.addTestSuite(PostNewMBCategoryThread4MessageTest.class);
-		testSuite.addTestSuite(PostNewMBCategoryThread5MessageTest.class);
-		testSuite.addTestSuite(PostNewMBCategoryThread6MessageTest.class);
+		testSuite.addTestSuite(PostNewMBCategoryThread1Test.class);
+		testSuite.addTestSuite(PostNewMBCategoryThread2Test.class);
+		testSuite.addTestSuite(PostNewMBCategoryThread3Test.class);
+		testSuite.addTestSuite(PostNewMBCategoryThread4Test.class);
+		testSuite.addTestSuite(PostNewMBCategoryThread5Test.class);
+		testSuite.addTestSuite(PostNewMBCategoryThread6Test.class);
 		testSuite.addTestSuite(ConfigurePortletMaximumItemsToDisplay2Test.class);
 		testSuite.addTestSuite(ConfigurePortletPaginationTypeRegularTest.class);
 		testSuite.addTestSuite(FirstButtonAPTest.class);
diff --git a/portal-web/test/com/liferay/portalweb/portlet/assetpublisher/mbthreadmessage/viewportletpaginationsimplembcategorythread6ap/ViewPortletPaginationSimpleMBCategoryThread6APTests.html b/portal-web/test/com/liferay/portalweb/portlet/assetpublisher/mbthreadmessage/viewportletpaginationsimplembcategorythread6ap/ViewPortletPaginationSimpleMBCategoryThread6APTests.html
index bbcadfdf9109b7..9e5487bea5a5f1 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/assetpublisher/mbthreadmessage/viewportletpaginationsimplembcategorythread6ap/ViewPortletPaginationSimpleMBCategoryThread6APTests.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/assetpublisher/mbthreadmessage/viewportletpaginationsimplembcategorythread6ap/ViewPortletPaginationSimpleMBCategoryThread6APTests.html
@@ -13,17 +13,17 @@
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPageMBTest.html">AddPageMBTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPortletMBTest.html">AddPortletMBTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/AddMBCategoryTest.html">AddMBCategoryTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThread1MessageTest.html">PostNewMBCategoryThread1MessageTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThread2MessageTest.html">PostNewMBCategoryThread2MessageTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThread3MessageTest.html">PostNewMBCategoryThread3MessageTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThread4MessageTest.html">PostNewMBCategoryThread4MessageTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThread5MessageTest.html">PostNewMBCategoryThread5MessageTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThread6MessageTest.html">PostNewMBCategoryThread6MessageTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategoryThread1Test.html">PostNewMBCategoryThread1Test</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategoryThread2Test.html">PostNewMBCategoryThread2Test</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategoryThread3Test.html">PostNewMBCategoryThread3Test</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategoryThread4Test.html">PostNewMBCategoryThread4Test</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategoryThread5Test.html">PostNewMBCategoryThread5Test</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategoryThread6Test.html">PostNewMBCategoryThread6Test</a></td></tr>
 <tr><td><a href="ConfigurePortletMaximumItemsToDisplay2Test.html">ConfigurePortletMaximumItemsToDisplay2Test</a></td></tr>
 <tr><td><a href="ConfigurePortletPaginationTypeSimpleTest.html">ConfigurePortletPaginationTypeSimpleTest</a></td></tr>
 <tr><td><a href="NextButtonAPTest.html">NextButtonAPTest</a></td></tr>
 <tr><td><a href="PreviousButtonAPTest.html">PreviousButtonAPTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/postnewmbthreadmessage/TearDownMBThreadTest.html">TearDownMBThreadTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/postnewmbthread/TearDownMBThreadTest.html">TearDownMBThreadTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portal/util/TearDownPageTest.html">TearDownPageTest</a></td></tr>
 </tbody></table>
 </body>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/assetpublisher/mbthreadmessage/viewportletpaginationsimplembcategorythread6ap/ViewPortletPaginationSimpleMBCategoryThread6APTests.java b/portal-web/test/com/liferay/portalweb/portlet/assetpublisher/mbthreadmessage/viewportletpaginationsimplembcategorythread6ap/ViewPortletPaginationSimpleMBCategoryThread6APTests.java
index 76bc26de7435e8..c6b3083750a94a 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/assetpublisher/mbthreadmessage/viewportletpaginationsimplembcategorythread6ap/ViewPortletPaginationSimpleMBCategoryThread6APTests.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/assetpublisher/mbthreadmessage/viewportletpaginationsimplembcategorythread6ap/ViewPortletPaginationSimpleMBCategoryThread6APTests.java
@@ -19,13 +19,13 @@
 import com.liferay.portalweb.portlet.assetpublisher.portlet.addportletap.AddPageAPTest;
 import com.liferay.portalweb.portlet.assetpublisher.portlet.addportletap.AddPortletAPTest;
 import com.liferay.portalweb.portlet.messageboards.mbcategory.addmbcategory.AddMBCategoryTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbcategorythreadmessage.PostNewMBCategoryThread1MessageTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbcategorythreadmessage.PostNewMBCategoryThread2MessageTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbcategorythreadmessage.PostNewMBCategoryThread3MessageTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbcategorythreadmessage.PostNewMBCategoryThread4MessageTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbcategorythreadmessage.PostNewMBCategoryThread5MessageTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbcategorythreadmessage.PostNewMBCategoryThread6MessageTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbthreadmessage.TearDownMBThreadTest;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbcategorythread.PostNewMBCategoryThread1Test;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbcategorythread.PostNewMBCategoryThread2Test;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbcategorythread.PostNewMBCategoryThread3Test;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbcategorythread.PostNewMBCategoryThread4Test;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbcategorythread.PostNewMBCategoryThread5Test;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbcategorythread.PostNewMBCategoryThread6Test;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbthread.TearDownMBThreadTest;
 import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPageMBTest;
 import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPortletMBTest;
 
@@ -44,12 +44,12 @@ public static Test suite() {
 		testSuite.addTestSuite(AddPageMBTest.class);
 		testSuite.addTestSuite(AddPortletMBTest.class);
 		testSuite.addTestSuite(AddMBCategoryTest.class);
-		testSuite.addTestSuite(PostNewMBCategoryThread1MessageTest.class);
-		testSuite.addTestSuite(PostNewMBCategoryThread2MessageTest.class);
-		testSuite.addTestSuite(PostNewMBCategoryThread3MessageTest.class);
-		testSuite.addTestSuite(PostNewMBCategoryThread4MessageTest.class);
-		testSuite.addTestSuite(PostNewMBCategoryThread5MessageTest.class);
-		testSuite.addTestSuite(PostNewMBCategoryThread6MessageTest.class);
+		testSuite.addTestSuite(PostNewMBCategoryThread1Test.class);
+		testSuite.addTestSuite(PostNewMBCategoryThread2Test.class);
+		testSuite.addTestSuite(PostNewMBCategoryThread3Test.class);
+		testSuite.addTestSuite(PostNewMBCategoryThread4Test.class);
+		testSuite.addTestSuite(PostNewMBCategoryThread5Test.class);
+		testSuite.addTestSuite(PostNewMBCategoryThread6Test.class);
 		testSuite.addTestSuite(ConfigurePortletMaximumItemsToDisplay2Test.class);
 		testSuite.addTestSuite(ConfigurePortletPaginationTypeSimpleTest.class);
 		testSuite.addTestSuite(NextButtonAPTest.class);
diff --git a/portal-web/test/com/liferay/portalweb/portlet/assetpublisher/mbthreadmessage/viewportlettablembcategorythreadmessageap/ViewPortletTableMBCategoryThreadMessageAPTests.html b/portal-web/test/com/liferay/portalweb/portlet/assetpublisher/mbthreadmessage/viewportlettablembcategorythreadmessageap/ViewPortletTableMBCategoryThreadMessageAPTests.html
index 6d6ea83f0fd470..aca80d92cf25cd 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/assetpublisher/mbthreadmessage/viewportlettablembcategorythreadmessageap/ViewPortletTableMBCategoryThreadMessageAPTests.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/assetpublisher/mbthreadmessage/viewportlettablembcategorythreadmessageap/ViewPortletTableMBCategoryThreadMessageAPTests.html
@@ -13,10 +13,10 @@
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPageMBTest.html">AddPageMBTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPortletMBTest.html">AddPortletMBTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/AddMBCategoryTest.html">AddMBCategoryTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThreadMessageTest.html">PostNewMBCategoryThreadMessageTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategoryThreadTest.html">PostNewMBCategoryThreadTest</a></td></tr>
 <tr><td><a href="ConfigurePortletDisplayStyleTableTest.html">ConfigurePortletDisplayStyleTableTest</a></td></tr>
 <tr><td><a href="ViewPortletTableMBCategoryThreadMessageAPTest.html">ViewPortletTableMBCategoryThreadMessageAPTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/postnewmbthreadmessage/TearDownMBThreadTest.html">TearDownMBThreadTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/postnewmbthread/TearDownMBThreadTest.html">TearDownMBThreadTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portal/util/TearDownPageTest.html">TearDownPageTest</a></td></tr>
 </tbody></table>
 </body>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/assetpublisher/mbthreadmessage/viewportlettablembcategorythreadmessageap/ViewPortletTableMBCategoryThreadMessageAPTests.java b/portal-web/test/com/liferay/portalweb/portlet/assetpublisher/mbthreadmessage/viewportlettablembcategorythreadmessageap/ViewPortletTableMBCategoryThreadMessageAPTests.java
index 1fc0d8bc6af67c..4f8482e4c6da96 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/assetpublisher/mbthreadmessage/viewportlettablembcategorythreadmessageap/ViewPortletTableMBCategoryThreadMessageAPTests.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/assetpublisher/mbthreadmessage/viewportlettablembcategorythreadmessageap/ViewPortletTableMBCategoryThreadMessageAPTests.java
@@ -19,8 +19,8 @@
 import com.liferay.portalweb.portlet.assetpublisher.portlet.addportletap.AddPageAPTest;
 import com.liferay.portalweb.portlet.assetpublisher.portlet.addportletap.AddPortletAPTest;
 import com.liferay.portalweb.portlet.messageboards.mbcategory.addmbcategory.AddMBCategoryTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbcategorythreadmessage.PostNewMBCategoryThreadMessageTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbthreadmessage.TearDownMBThreadTest;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbcategorythread.PostNewMBCategoryThreadTest;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbthread.TearDownMBThreadTest;
 import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPageMBTest;
 import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPortletMBTest;
 
@@ -39,7 +39,7 @@ public static Test suite() {
 		testSuite.addTestSuite(AddPageMBTest.class);
 		testSuite.addTestSuite(AddPortletMBTest.class);
 		testSuite.addTestSuite(AddMBCategoryTest.class);
-		testSuite.addTestSuite(PostNewMBCategoryThreadMessageTest.class);
+		testSuite.addTestSuite(PostNewMBCategoryThreadTest.class);
 		testSuite.addTestSuite(ConfigurePortletDisplayStyleTableTest.class);
 		testSuite.addTestSuite(ViewPortletTableMBCategoryThreadMessageAPTest.class);
 		testSuite.addTestSuite(TearDownMBThreadTest.class);
diff --git a/portal-web/test/com/liferay/portalweb/portlet/assetpublisher/mbthreadmessage/viewportlettitlelistmbcategorythreadmessageap/ViewPortletTitleListMBCategoryThreadMessageAPTests.html b/portal-web/test/com/liferay/portalweb/portlet/assetpublisher/mbthreadmessage/viewportlettitlelistmbcategorythreadmessageap/ViewPortletTitleListMBCategoryThreadMessageAPTests.html
index ee4d4589e63038..6d3321e119ac8e 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/assetpublisher/mbthreadmessage/viewportlettitlelistmbcategorythreadmessageap/ViewPortletTitleListMBCategoryThreadMessageAPTests.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/assetpublisher/mbthreadmessage/viewportlettitlelistmbcategorythreadmessageap/ViewPortletTitleListMBCategoryThreadMessageAPTests.html
@@ -13,10 +13,10 @@
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPageMBTest.html">AddPageMBTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPortletMBTest.html">AddPortletMBTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/AddMBCategoryTest.html">AddMBCategoryTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThreadMessageTest.html">PostNewMBCategoryThreadMessageTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategoryThreadTest.html">PostNewMBCategoryThreadTest</a></td></tr>
 <tr><td><a href="ConfigurePortletDisplayStyleTitleListTest.html">ConfigurePortletDisplayStyleTitleListTest</a></td></tr>
 <tr><td><a href="ViewPortletTitleListMBCategoryThreadMessageAPTest.html">ViewPortletTitleListMBCategoryThreadMessageAPTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/postnewmbthreadmessage/TearDownMBThreadTest.html">TearDownMBThreadTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/postnewmbthread/TearDownMBThreadTest.html">TearDownMBThreadTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portal/util/TearDownPageTest.html">TearDownPageTest</a></td></tr>
 </tbody></table>
 </body>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/assetpublisher/mbthreadmessage/viewportlettitlelistmbcategorythreadmessageap/ViewPortletTitleListMBCategoryThreadMessageAPTests.java b/portal-web/test/com/liferay/portalweb/portlet/assetpublisher/mbthreadmessage/viewportlettitlelistmbcategorythreadmessageap/ViewPortletTitleListMBCategoryThreadMessageAPTests.java
index afd07300cf6c3d..d3d019a10ff9c2 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/assetpublisher/mbthreadmessage/viewportlettitlelistmbcategorythreadmessageap/ViewPortletTitleListMBCategoryThreadMessageAPTests.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/assetpublisher/mbthreadmessage/viewportlettitlelistmbcategorythreadmessageap/ViewPortletTitleListMBCategoryThreadMessageAPTests.java
@@ -19,8 +19,8 @@
 import com.liferay.portalweb.portlet.assetpublisher.portlet.addportletap.AddPageAPTest;
 import com.liferay.portalweb.portlet.assetpublisher.portlet.addportletap.AddPortletAPTest;
 import com.liferay.portalweb.portlet.messageboards.mbcategory.addmbcategory.AddMBCategoryTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbcategorythreadmessage.PostNewMBCategoryThreadMessageTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbthreadmessage.TearDownMBThreadTest;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbcategorythread.PostNewMBCategoryThreadTest;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbthread.TearDownMBThreadTest;
 import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPageMBTest;
 import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPortletMBTest;
 
@@ -39,7 +39,7 @@ public static Test suite() {
 		testSuite.addTestSuite(AddPageMBTest.class);
 		testSuite.addTestSuite(AddPortletMBTest.class);
 		testSuite.addTestSuite(AddMBCategoryTest.class);
-		testSuite.addTestSuite(PostNewMBCategoryThreadMessageTest.class);
+		testSuite.addTestSuite(PostNewMBCategoryThreadTest.class);
 		testSuite.addTestSuite(ConfigurePortletDisplayStyleTitleListTest.class);
 		testSuite.addTestSuite(ViewPortletTitleListMBCategoryThreadMessageAPTest.class);
 		testSuite.addTestSuite(TearDownMBThreadTest.class);
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/HybridTestPlan.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/HybridTestPlan.java
index 9c83618b0ecddb..02e118a22d6f63 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/HybridTestPlan.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/HybridTestPlan.java
@@ -15,7 +15,7 @@
 package com.liferay.portalweb.portlet.messageboards.hybrid;
 
 import com.liferay.portalweb.portal.BaseTestSuite;
-import com.liferay.portalweb.portlet.messageboards.hybrid.gmailviewmbthreadmessagegmail.Gmail_ViewMBThreadMessageGmailTests;
+import com.liferay.portalweb.portlet.messageboards.hybrid.gmailviewmbthreadgmail.Gmail_ViewMBThreadGmailTests;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
@@ -28,7 +28,7 @@ public class HybridTestPlan extends BaseTestSuite {
 	public static Test suite() {
 		TestSuite testSuite = new TestSuite();
 
-		testSuite.addTest(Gmail_ViewMBThreadMessageGmailTests.suite());
+		testSuite.addTest(Gmail_ViewMBThreadGmailTests.suite());
 
 		return testSuite;
 	}
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/gmailviewmbthreadmessagegmail/AddMBCategorySiteTest.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/gmailviewmbthreadgmail/AddMBCategorySiteTest.html
similarity index 100%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/gmailviewmbthreadmessagegmail/AddMBCategorySiteTest.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/gmailviewmbthreadgmail/AddMBCategorySiteTest.html
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/gmailviewmbthreadmessagegmail/AddMBCategorySiteTest.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/gmailviewmbthreadgmail/AddMBCategorySiteTest.java
similarity index 98%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/gmailviewmbthreadmessagegmail/AddMBCategorySiteTest.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/gmailviewmbthreadgmail/AddMBCategorySiteTest.java
index 1f2d3181f17604..b8d4e9d6654121 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/gmailviewmbthreadmessagegmail/AddMBCategorySiteTest.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/gmailviewmbthreadgmail/AddMBCategorySiteTest.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.hybrid.gmailviewmbthreadmessagegmail;
+package com.liferay.portalweb.portlet.messageboards.hybrid.gmailviewmbthreadgmail;
 
 import com.liferay.portalweb.portal.BaseTestCase;
 import com.liferay.portalweb.portal.util.RuntimeVariables;
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/gmailviewmbthreadmessagegmail/AddUserGmailTest.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/gmailviewmbthreadgmail/AddUserGmailTest.html
similarity index 100%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/gmailviewmbthreadmessagegmail/AddUserGmailTest.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/gmailviewmbthreadgmail/AddUserGmailTest.html
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/gmailviewmbthreadmessagegmail/AddUserGmailTest.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/gmailviewmbthreadgmail/AddUserGmailTest.java
similarity index 99%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/gmailviewmbthreadmessagegmail/AddUserGmailTest.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/gmailviewmbthreadgmail/AddUserGmailTest.java
index 55b71045bfa783..e3ee610a171e0b 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/gmailviewmbthreadmessagegmail/AddUserGmailTest.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/gmailviewmbthreadgmail/AddUserGmailTest.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.hybrid.gmailviewmbthreadmessagegmail;
+package com.liferay.portalweb.portlet.messageboards.hybrid.gmailviewmbthreadgmail;
 
 import com.liferay.portalweb.portal.BaseTestCase;
 import com.liferay.portalweb.portal.util.RuntimeVariables;
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/gmailviewmbthreadmessagegmail/ConfigurePortletEmailFromAddressTest.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/gmailviewmbthreadgmail/ConfigurePortletEmailFromAddressTest.html
similarity index 100%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/gmailviewmbthreadmessagegmail/ConfigurePortletEmailFromAddressTest.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/gmailviewmbthreadgmail/ConfigurePortletEmailFromAddressTest.html
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/gmailviewmbthreadmessagegmail/ConfigurePortletEmailFromAddressTest.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/gmailviewmbthreadgmail/ConfigurePortletEmailFromAddressTest.java
similarity index 99%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/gmailviewmbthreadmessagegmail/ConfigurePortletEmailFromAddressTest.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/gmailviewmbthreadgmail/ConfigurePortletEmailFromAddressTest.java
index c5c0070c2d4b16..be2d828019b4a8 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/gmailviewmbthreadmessagegmail/ConfigurePortletEmailFromAddressTest.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/gmailviewmbthreadgmail/ConfigurePortletEmailFromAddressTest.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.hybrid.gmailviewmbthreadmessagegmail;
+package com.liferay.portalweb.portlet.messageboards.hybrid.gmailviewmbthreadgmail;
 
 import com.liferay.portalweb.portal.BaseTestCase;
 import com.liferay.portalweb.portal.util.RuntimeVariables;
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/gmailviewmbthreadmessagegmail/EditMBCategoryMailingListActiveActionsTest.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/gmailviewmbthreadgmail/EditMBCategoryMailingListActiveActionsTest.html
similarity index 100%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/gmailviewmbthreadmessagegmail/EditMBCategoryMailingListActiveActionsTest.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/gmailviewmbthreadgmail/EditMBCategoryMailingListActiveActionsTest.html
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/gmailviewmbthreadmessagegmail/EditMBCategoryMailingListActiveActionsTest.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/gmailviewmbthreadgmail/EditMBCategoryMailingListActiveActionsTest.java
similarity index 99%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/gmailviewmbthreadmessagegmail/EditMBCategoryMailingListActiveActionsTest.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/gmailviewmbthreadgmail/EditMBCategoryMailingListActiveActionsTest.java
index 82852506a3db30..72fda782bab348 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/gmailviewmbthreadmessagegmail/EditMBCategoryMailingListActiveActionsTest.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/gmailviewmbthreadgmail/EditMBCategoryMailingListActiveActionsTest.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.hybrid.gmailviewmbthreadmessagegmail;
+package com.liferay.portalweb.portlet.messageboards.hybrid.gmailviewmbthreadgmail;
 
 import com.liferay.portalweb.portal.BaseTestCase;
 import com.liferay.portalweb.portal.util.RuntimeVariables;
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/gmailviewmbthreadmessagegmail/Gmail_ViewMBThreadMessageGmailTests.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/gmailviewmbthreadgmail/Gmail_ViewMBThreadGmailTests.html
similarity index 93%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/gmailviewmbthreadmessagegmail/Gmail_ViewMBThreadMessageGmailTests.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/gmailviewmbthreadgmail/Gmail_ViewMBThreadGmailTests.html
index 116c384ca12573..5a48a84745c958 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/gmailviewmbthreadmessagegmail/Gmail_ViewMBThreadMessageGmailTests.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/gmailviewmbthreadgmail/Gmail_ViewMBThreadGmailTests.html
@@ -16,7 +16,7 @@
 <tr><td><a href="ConfigurePortletEmailFromAddressTest.html">ConfigurePortletEmailFromAddressTest</a></td></tr>
 <tr><td><a href="AddMBCategorySiteTest.html">AddMBCategorySiteTest</a></td></tr>
 <tr><td><a href="EditMBCategoryMailingListActiveActionsTest.html">EditMBCategoryMailingListActiveActionsTest</a></td></tr>
-<tr><td><a href="PostNewMBCategoryThreadMessageSiteTest.html">PostNewMBCategoryThreadMessageSiteTest</a></td></tr>
+<tr><td><a href="PostNewMBCategoryThreadSiteTest.html">PostNewMBCategoryThreadSiteTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portal/controlpanel/users/user/adduser/TearDownUserTest.html">TearDownUserTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portal/controlpanel/sites/site/addsite/TearDownSiteTest.html">TearDownSiteTest</a></td></tr>
 </tbody></table>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/gmailviewmbthreadmessagegmail/Gmail_ViewMBThreadMessageGmailTests.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/gmailviewmbthreadgmail/Gmail_ViewMBThreadGmailTests.java
similarity index 92%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/gmailviewmbthreadmessagegmail/Gmail_ViewMBThreadMessageGmailTests.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/gmailviewmbthreadgmail/Gmail_ViewMBThreadGmailTests.java
index 6266d0fca717db..4a80648b9f5820 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/gmailviewmbthreadmessagegmail/Gmail_ViewMBThreadMessageGmailTests.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/gmailviewmbthreadgmail/Gmail_ViewMBThreadGmailTests.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.hybrid.gmailviewmbthreadmessagegmail;
+package com.liferay.portalweb.portlet.messageboards.hybrid.gmailviewmbthreadgmail;
 
 import com.liferay.portalweb.portal.BaseTestSuite;
 import com.liferay.portalweb.portal.controlpanel.sites.site.addmemberssiteuser.AddMembersSiteUserTest;
@@ -28,7 +28,7 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class Gmail_ViewMBThreadMessageGmailTests extends BaseTestSuite {
+public class Gmail_ViewMBThreadGmailTests extends BaseTestSuite {
 	public static Test suite() {
 		TestSuite testSuite = new TestSuite();
 		testSuite.addTestSuite(AddSiteTest.class);
@@ -39,7 +39,7 @@ public static Test suite() {
 		testSuite.addTestSuite(ConfigurePortletEmailFromAddressTest.class);
 		testSuite.addTestSuite(AddMBCategorySiteTest.class);
 		testSuite.addTestSuite(EditMBCategoryMailingListActiveActionsTest.class);
-		testSuite.addTestSuite(PostNewMBCategoryThreadMessageSiteTest.class);
+		testSuite.addTestSuite(PostNewMBCategoryThreadSiteTest.class);
 		testSuite.addTestSuite(TearDownUserTest.class);
 		testSuite.addTestSuite(TearDownSiteTest.class);
 
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/gmailviewmbthreadmessagegmail/HYBRID_Gmail_ViewMBThreadMessageGmailTests.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/gmailviewmbthreadgmail/HYBRID_Gmail_ViewMBThreadGmailTests.html
similarity index 92%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/gmailviewmbthreadmessagegmail/HYBRID_Gmail_ViewMBThreadMessageGmailTests.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/gmailviewmbthreadgmail/HYBRID_Gmail_ViewMBThreadGmailTests.html
index 83d131723836e0..0d7fa817c04276 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/gmailviewmbthreadmessagegmail/HYBRID_Gmail_ViewMBThreadMessageGmailTests.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/gmailviewmbthreadgmail/HYBRID_Gmail_ViewMBThreadGmailTests.html
@@ -16,7 +16,7 @@
 <tr><td><a href="ConfigurePortletEmailFromAddressTest.html">ConfigurePortletEmailFromAddressTest</a></td></tr>
 <tr><td><a href="AddMBCategorySiteTest.html">AddMBCategorySiteTest</a></td></tr>
 <tr><td><a href="EditMBCategoryMailingListActiveActionsTest.html">EditMBCategoryMailingListActiveActionsTest</a></td></tr>
-<tr><td><a href="PostNewMBCategoryThreadMessageSiteTest.html">PostNewMBCategoryThreadMessageSiteTest</a></td></tr>
+<tr><td><a href="PostNewMBCategoryThreadSiteTest.html">PostNewMBCategoryThreadSiteTest</a></td></tr>
 </tbody></table>
 </body>
 </html>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/gmailviewmbthreadmessagegmail/HYBRID_Gmail_ViewMBThreadMessageGmailTests.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/gmailviewmbthreadgmail/HYBRID_Gmail_ViewMBThreadGmailTests.java
similarity index 90%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/gmailviewmbthreadmessagegmail/HYBRID_Gmail_ViewMBThreadMessageGmailTests.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/gmailviewmbthreadgmail/HYBRID_Gmail_ViewMBThreadGmailTests.java
index 402e06e4fdfd8f..84fe3f3eb060f1 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/gmailviewmbthreadmessagegmail/HYBRID_Gmail_ViewMBThreadMessageGmailTests.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/gmailviewmbthreadgmail/HYBRID_Gmail_ViewMBThreadGmailTests.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.hybrid.gmailviewmbthreadmessagegmail;
+package com.liferay.portalweb.portlet.messageboards.hybrid.gmailviewmbthreadgmail;
 
 import com.liferay.portalweb.portal.BaseTestSuite;
 import com.liferay.portalweb.portal.controlpanel.sites.site.addmemberssiteuser.AddMembersSiteUserTest;
@@ -26,7 +26,7 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class HYBRID_Gmail_ViewMBThreadMessageGmailTests extends BaseTestSuite {
+public class HYBRID_Gmail_ViewMBThreadGmailTests extends BaseTestSuite {
 	public static Test suite() {
 		TestSuite testSuite = new TestSuite();
 		testSuite.addTestSuite(AddSiteTest.class);
@@ -37,7 +37,7 @@ public static Test suite() {
 		testSuite.addTestSuite(ConfigurePortletEmailFromAddressTest.class);
 		testSuite.addTestSuite(AddMBCategorySiteTest.class);
 		testSuite.addTestSuite(EditMBCategoryMailingListActiveActionsTest.class);
-		testSuite.addTestSuite(PostNewMBCategoryThreadMessageSiteTest.class);
+		testSuite.addTestSuite(PostNewMBCategoryThreadSiteTest.class);
 
 		return testSuite;
 	}
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/gmailviewmbthreadmessagegmail/PostNewMBCategoryThreadMessageSiteTest.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/gmailviewmbthreadgmail/PostNewMBCategoryThreadSiteTest.html
similarity index 96%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/gmailviewmbthreadmessagegmail/PostNewMBCategoryThreadMessageSiteTest.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/gmailviewmbthreadgmail/PostNewMBCategoryThreadSiteTest.html
index 25b60df3d73fb5..9e043b1d26932b 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/gmailviewmbthreadmessagegmail/PostNewMBCategoryThreadMessageSiteTest.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/gmailviewmbthreadgmail/PostNewMBCategoryThreadSiteTest.html
@@ -1,12 +1,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>PostNewMBCategoryThreadMessageSiteTest</title>
+<title>PostNewMBCategoryThreadSiteTest</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3">PostNewMBCategoryThreadMessageSiteTest</td></tr>
+<tr><td rowspan="1" colspan="3">PostNewMBCategoryThreadSiteTest</td></tr>
 </thead><tbody>
 <tr>
 	<td>selectWindow</td>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/gmailviewmbthreadmessagegmail/PostNewMBCategoryThreadMessageSiteTest.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/gmailviewmbthreadgmail/PostNewMBCategoryThreadSiteTest.java
similarity index 97%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/gmailviewmbthreadmessagegmail/PostNewMBCategoryThreadMessageSiteTest.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/gmailviewmbthreadgmail/PostNewMBCategoryThreadSiteTest.java
index 5a3362b66c71dc..dd55335cfba9fe 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/gmailviewmbthreadmessagegmail/PostNewMBCategoryThreadMessageSiteTest.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/gmailviewmbthreadgmail/PostNewMBCategoryThreadSiteTest.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.hybrid.gmailviewmbthreadmessagegmail;
+package com.liferay.portalweb.portlet.messageboards.hybrid.gmailviewmbthreadgmail;
 
 import com.liferay.portalweb.portal.BaseTestCase;
 import com.liferay.portalweb.portal.util.RuntimeVariables;
@@ -20,9 +20,8 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class PostNewMBCategoryThreadMessageSiteTest extends BaseTestCase {
-	public void testPostNewMBCategoryThreadMessageSite()
-		throws Exception {
+public class PostNewMBCategoryThreadSiteTest extends BaseTestCase {
+	public void testPostNewMBCategoryThreadSite() throws Exception {
 		selenium.selectWindow("null");
 		selenium.selectFrame("relative=top");
 		selenium.open("/web/site-name");
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/gmailviewmbthreadmessagegmail/ViewMBThreadMessageGmailTest.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/gmailviewmbthreadgmail/ViewMBThreadGmailTest.html
similarity index 93%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/gmailviewmbthreadmessagegmail/ViewMBThreadMessageGmailTest.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/gmailviewmbthreadgmail/ViewMBThreadGmailTest.html
index 529a8ff00f5e8a..7c3e418655b840 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/gmailviewmbthreadmessagegmail/ViewMBThreadMessageGmailTest.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/gmailviewmbthreadgmail/ViewMBThreadGmailTest.html
@@ -1,12 +1,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>ViewMBThreadMessageGmailTest</title>
+<title>ViewMBThreadGmailTest</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3">ViewMBThreadMessageGmailTest</td></tr>
+<tr><td rowspan="1" colspan="3">ViewMBThreadGmailTest</td></tr>
 </thead><tbody>
 <tr>
 	<td>selectWindow</td>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/gmailviewmbthreadmessagegmail/ViewMBThreadMessageGmailTest.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/gmailviewmbthreadgmail/ViewMBThreadGmailTest.java
similarity index 94%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/gmailviewmbthreadmessagegmail/ViewMBThreadMessageGmailTest.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/gmailviewmbthreadgmail/ViewMBThreadGmailTest.java
index 6eacd0e8ad9b24..be76666157be91 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/gmailviewmbthreadmessagegmail/ViewMBThreadMessageGmailTest.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/hybrid/gmailviewmbthreadgmail/ViewMBThreadGmailTest.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.hybrid.gmailviewmbthreadmessagegmail;
+package com.liferay.portalweb.portlet.messageboards.hybrid.gmailviewmbthreadgmail;
 
 import com.liferay.portalweb.portal.BaseTestCase;
 import com.liferay.portalweb.portal.util.RuntimeVariables;
@@ -20,8 +20,8 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class ViewMBThreadMessageGmailTest extends BaseTestCase {
-	public void testViewMBThreadMessageGmail() throws Exception {
+public class ViewMBThreadGmailTest extends BaseTestCase {
+	public void testViewMBThreadGmail() throws Exception {
 		selenium.selectWindow("null");
 		selenium.selectFrame("relative=top");
 		selenium.open("/web/site-name/");
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/MBMessageTestPlan.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/MBMessageTestPlan.java
deleted file mode 100644
index 4a25b61d31499c..00000000000000
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/MBMessageTestPlan.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/**
- * Copyright (c) 2000-2012 Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- */
-
-package com.liferay.portalweb.portlet.messageboards.mbmessage;
-
-import com.liferay.portalweb.portal.BaseTestSuite;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.addmbcategorymessage.AddMBCategoryMessageTests;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.addmbcategorymessagebodynull.AddMBCategoryMessageBodyNullTests;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.addmbcategorymessagemultiple.AddMBCategoryMessageMultipleTests;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.addmbcategorymessagequestion.AddMBCategoryMessageQuestionTests;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.addmbcategorymessagereply.AddMBCategoryMessageReplyTests;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.addmbcategorymessagereplymultiple.AddMBCategoryMessageReplyMultipleTests;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.addmbcategorymessagesubjectnull.AddMBCategoryMessageSubjectNullTests;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.addmbcategorymessageutf8.AddMBCategoryMessageUTF8Tests;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.addmbmessage.AddMBMessageTests;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.addmbsubcategorymessage.AddMBSubcategoryMessageTests;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.addmbsubcategorymessagebodynull.AddMBSubcategoryMessageBodyNullTests;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.addmbsubcategorymessagemultiple.AddMBSubcategoryMessageMultipleTests;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.addmbsubcategorymessagesubjectnull.AddMBSubcategoryMessageSubjectNullTests;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.deletemarkasanswermbcategorymessagereply.DeleteMarkAsAnswerMBCategoryMessageReplyTests;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.deletembcategorymessage.DeleteMBCategoryMessageTests;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.editmbcategorymessagebody.EditMBCategoryMessageBodyTests;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.editmbcategorymessagebodynull.EditMBCategoryMessageBodyNullTests;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.editmbcategorymessagesubject.EditMBCategoryMessageSubjectTests;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.editmbcategorymessagesubjectnull.EditMBCategoryMessageSubjectNullTests;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.guestviewmbthreadmessageguestviewoff.Guest_ViewMBThreadMessageGuestViewOffTests;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.markasanswermbcategorymessagequestionreply.MarkAsAnswerMBCategoryMessageQuestionReplyTests;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.movembcategorymessagetocategory.MoveMBCategoryMessageToCategoryTests;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.movembcategorymessagetocategoryexplanation.MoveMBCategoryMessageToCategoryExplanationTests;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.nextmbcategorymessage.NextMBCategoryMessageTests;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbcategoriesthreadmessage.PostNewMBCategoriesThreadMessageTests;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbcategorythreadmessage.PostNewMBCategoryThreadMessageTests;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbcategorythreadsmessage.PostNewMBCategoryThreadsMessageTests;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbthreadmessage.PostNewMBThreadMessageTests;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbthreadsmessage.PostNewMBThreadsMessageTests;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.previewmbthreadmessagedetails.PreviewMBThreadMessageDetailsTests;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.previousmbcategorymessage.PreviousMBCategoryMessageTests;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.ratembcategorymessage.RateMBCategoryMessageTests;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.replymbcategorythreadmessagereplies.ReplyMBCategoryThreadMessageRepliesTests;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.replymbcategorythreadmessagereply.ReplyMBCategoryThreadMessageReplyTests;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.replymbcategorythreadmessagereplyreply.ReplyMBCategoryThreadMessageReplyReplyTests;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.replymbthreadmessagereplies.ReplyMBThreadMessageRepliesTests;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.replymbthreadmessagereply.ReplyMBThreadMessageReplyTests;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.replymbthreadmessagereplymultiple.ReplyMBThreadMessageReplyMultipleTests;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.searchmbcategorymessage.SearchMBCategoryMessageTests;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.splitthreadmbcategorymessagereply.SplitThreadMBCategoryMessageReplyTests;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.splitthreadmbcategorymessagereplybackbutton.SplitThreadMBCategoryMessageReplyBackButtonTests;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.splitthreadmbcategorymessagereplyexplanation.SplitThreadMBCategoryMessageReplyExplanationTests;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.splitthreadmbcategorymessagereplyreply.SplitThreadMBCategoryMessageReplyReplyTests;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.unmarkmbcategorymessagequestionreply.UnmarkMBCategoryMessageQuestionReplyTests;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.viewmbcategorymessagemyposts.ViewMBCategoryMessageMyPostsTests;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.viewmbcategorymessagepostcount.ViewMBCategoryMessagePostCountTests;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.viewmbcategorymessagerecentposts.ViewMBCategoryMessageRecentPostsTests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-/**
- * @author Brian Wing Shun Chan
- */
-public class MBMessageTestPlan extends BaseTestSuite {
-
-	public static Test suite() {
-		TestSuite testSuite = new TestSuite();
-
-		testSuite.addTest(AddMBCategoryMessageTests.suite());
-		testSuite.addTest(AddMBCategoryMessageBodyNullTests.suite());
-		testSuite.addTest(AddMBCategoryMessageMultipleTests.suite());
-		testSuite.addTest(AddMBCategoryMessageQuestionTests.suite());
-		testSuite.addTest(AddMBCategoryMessageReplyTests.suite());
-		testSuite.addTest(AddMBCategoryMessageReplyMultipleTests.suite());
-		testSuite.addTest(AddMBCategoryMessageSubjectNullTests.suite());
-		testSuite.addTest(AddMBCategoryMessageUTF8Tests.suite());
-		testSuite.addTest(AddMBMessageTests.suite());
-		testSuite.addTest(AddMBSubcategoryMessageTests.suite());
-		testSuite.addTest(AddMBSubcategoryMessageBodyNullTests.suite());
-		testSuite.addTest(AddMBSubcategoryMessageMultipleTests.suite());
-		testSuite.addTest(AddMBSubcategoryMessageSubjectNullTests.suite());
-		testSuite.addTest(DeleteMBCategoryMessageTests.suite());
-		testSuite.addTest(DeleteMarkAsAnswerMBCategoryMessageReplyTests.suite());
-		testSuite.addTest(EditMBCategoryMessageBodyTests.suite());
-		testSuite.addTest(EditMBCategoryMessageBodyNullTests.suite());
-		testSuite.addTest(EditMBCategoryMessageSubjectTests.suite());
-		testSuite.addTest(EditMBCategoryMessageSubjectNullTests.suite());
-		testSuite.addTest(Guest_ViewMBThreadMessageGuestViewOffTests.suite());
-		testSuite.addTest(
-			MarkAsAnswerMBCategoryMessageQuestionReplyTests.suite());
-		testSuite.addTest(MoveMBCategoryMessageToCategoryTests.suite());
-		testSuite.addTest(
-			MoveMBCategoryMessageToCategoryExplanationTests.suite());
-		testSuite.addTest(NextMBCategoryMessageTests.suite());
-		testSuite.addTest(PostNewMBCategoriesThreadMessageTests.suite());
-		testSuite.addTest(PostNewMBCategoryThreadMessageTests.suite());
-		testSuite.addTest(PostNewMBCategoryThreadsMessageTests.suite());
-		testSuite.addTest(PostNewMBThreadMessageTests.suite());
-		testSuite.addTest(PostNewMBThreadsMessageTests.suite());
-		testSuite.addTest(PreviewMBThreadMessageDetailsTests.suite());
-		testSuite.addTest(PreviousMBCategoryMessageTests.suite());
-		testSuite.addTest(RateMBCategoryMessageTests.suite());
-		testSuite.addTest(ReplyMBCategoryThreadMessageRepliesTests.suite());
-		testSuite.addTest(ReplyMBCategoryThreadMessageReplyTests.suite());
-		testSuite.addTest(ReplyMBCategoryThreadMessageReplyReplyTests.suite());
-		testSuite.addTest(ReplyMBThreadMessageRepliesTests.suite());
-		testSuite.addTest(ReplyMBThreadMessageReplyTests.suite());
-		testSuite.addTest(ReplyMBThreadMessageReplyMultipleTests.suite());
-		testSuite.addTest(SearchMBCategoryMessageTests.suite());
-		testSuite.addTest(SplitThreadMBCategoryMessageReplyTests.suite());
-		testSuite.addTest(
-			SplitThreadMBCategoryMessageReplyBackButtonTests.suite());
-		testSuite.addTest(
-			SplitThreadMBCategoryMessageReplyExplanationTests.suite());
-		testSuite.addTest(SplitThreadMBCategoryMessageReplyReplyTests.suite());
-		testSuite.addTest(UnmarkMBCategoryMessageQuestionReplyTests.suite());
-		testSuite.addTest(ViewMBCategoryMessageMyPostsTests.suite());
-		testSuite.addTest(ViewMBCategoryMessagePostCountTests.suite());
-		testSuite.addTest(ViewMBCategoryMessageRecentPostsTests.suite());
-
-		return testSuite;
-	}
-
-}
\ No newline at end of file
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessage/ViewMBCategoryMessageTest.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessage/ViewMBCategoryMessageTest.html
deleted file mode 100644
index fa9bd0a23ce198..00000000000000
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessage/ViewMBCategoryMessageTest.html
+++ /dev/null
@@ -1,89 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>ViewMBCategoryMessageTest</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-<thead>
-<tr><td rowspan="1" colspan="3">ViewMBCategoryMessageTest</td></tr>
-</thead><tbody>
-<tr>
-	<td>open</td>
-	<td>/web/guest/home/</td>
-	<td></td>
-</tr>
-<tr>
-	<td>waitForVisible</td>
-	<td>link=Message Boards Test Page</td>
-	<td>Message Boards Test Page</td>
-</tr>
-<tr>
-	<td>clickAtAndWait</td>
-	<td>link=Message Boards Test Page</td>
-	<td>Message Boards Test Page</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//td[1]/a/strong</td>
-	<td>MB Category Name</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//td[2]/a</td>
-	<td>0</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//td[3]/a</td>
-	<td>1</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//td[4]/a</td>
-	<td>1</td>
-</tr>
-<tr>
-	<td>clickAtAndWait</td>
-	<td>//td[1]/a/strong</td>
-	<td>MB Category Name</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//td[1]/a</td>
-	<td>MB Category Thread Message Subject</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//td[2]/a</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//td[3]/a</td>
-	<td>Joe Bloggs</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//td[4]/a</td>
-	<td>1</td>
-</tr>
-<tr>
-	<td>assertVisible</td>
-	<td>//td[5]/a</td>
-	<td>Views</td>
-</tr>
-<tr>
-	<td>assertPartialText</td>
-	<td>//td[6]/a</td>
-	<td>By: Joe Bloggs</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//td[7]/span/ul/li/strong/a</td>
-	<td>Actions</td>
-</tr>
-
-</tbody></table>
-</body>
-</html>
\ No newline at end of file
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessage/ViewMBCategoryMessageTest.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessage/ViewMBCategoryMessageTest.java
deleted file mode 100644
index a3ed4f15068e1e..00000000000000
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessage/ViewMBCategoryMessageTest.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/**
- * Copyright (c) 2000-2012 Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- */
-
-package com.liferay.portalweb.portlet.messageboards.mbmessage.addmbcategorymessage;
-
-import com.liferay.portalweb.portal.BaseTestCase;
-import com.liferay.portalweb.portal.util.RuntimeVariables;
-
-/**
- * @author Brian Wing Shun Chan
- */
-public class ViewMBCategoryMessageTest extends BaseTestCase {
-	public void testViewMBCategoryMessage() throws Exception {
-		selenium.open("/web/guest/home/");
-		loadRequiredJavaScriptModules();
-
-		for (int second = 0;; second++) {
-			if (second >= 90) {
-				fail("timeout");
-			}
-
-			try {
-				if (selenium.isVisible("link=Message Boards Test Page")) {
-					break;
-				}
-			}
-			catch (Exception e) {
-			}
-
-			Thread.sleep(1000);
-		}
-
-		selenium.clickAt("link=Message Boards Test Page",
-			RuntimeVariables.replace("Message Boards Test Page"));
-		selenium.waitForPageToLoad("30000");
-		loadRequiredJavaScriptModules();
-		assertEquals(RuntimeVariables.replace("MB Category Name"),
-			selenium.getText("//td[1]/a/strong"));
-		assertEquals(RuntimeVariables.replace("0"),
-			selenium.getText("//td[2]/a"));
-		assertEquals(RuntimeVariables.replace("1"),
-			selenium.getText("//td[3]/a"));
-		assertEquals(RuntimeVariables.replace("1"),
-			selenium.getText("//td[4]/a"));
-		selenium.clickAt("//td[1]/a/strong",
-			RuntimeVariables.replace("MB Category Name"));
-		selenium.waitForPageToLoad("30000");
-		loadRequiredJavaScriptModules();
-		assertEquals(RuntimeVariables.replace(
-				"MB Category Thread Message Subject"),
-			selenium.getText("//td[1]/a"));
-		assertEquals(RuntimeVariables.replace(""), selenium.getText("//td[2]/a"));
-		assertEquals(RuntimeVariables.replace("Joe Bloggs"),
-			selenium.getText("//td[3]/a"));
-		assertEquals(RuntimeVariables.replace("1"),
-			selenium.getText("//td[4]/a"));
-		assertTrue(selenium.isVisible("//td[5]/a"));
-		assertTrue(selenium.isPartialText("//td[6]/a", "By: Joe Bloggs"));
-		assertEquals(RuntimeVariables.replace("Actions"),
-			selenium.getText("//td[7]/span/ul/li/strong/a"));
-	}
-}
\ No newline at end of file
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessagemultiple/AddMBCategoryMessageMultipleTests.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessagemultiple/AddMBCategoryMessageMultipleTests.java
deleted file mode 100644
index f2962c45cb9bb0..00000000000000
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessagemultiple/AddMBCategoryMessageMultipleTests.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- * Copyright (c) 2000-2012 Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- */
-
-package com.liferay.portalweb.portlet.messageboards.mbmessage.addmbcategorymessagemultiple;
-
-import com.liferay.portalweb.portal.BaseTestSuite;
-import com.liferay.portalweb.portal.util.TearDownPageTest;
-import com.liferay.portalweb.portlet.messageboards.mbcategory.addmbcategory.AddMBCategoryTest;
-import com.liferay.portalweb.portlet.messageboards.mbcategory.addmbcategory.TearDownMBCategoryTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbcategorythreadmessage.PostNewMBCategoryThread1MessageTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbcategorythreadmessage.PostNewMBCategoryThread2MessageTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbcategorythreadmessage.PostNewMBCategoryThread3MessageTest;
-import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPageMBTest;
-import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPortletMBTest;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-/**
- * @author Brian Wing Shun Chan
- */
-public class AddMBCategoryMessageMultipleTests extends BaseTestSuite {
-	public static Test suite() {
-		TestSuite testSuite = new TestSuite();
-		testSuite.addTestSuite(AddPageMBTest.class);
-		testSuite.addTestSuite(AddPortletMBTest.class);
-		testSuite.addTestSuite(AddMBCategoryTest.class);
-		testSuite.addTestSuite(PostNewMBCategoryThread1MessageTest.class);
-		testSuite.addTestSuite(PostNewMBCategoryThread2MessageTest.class);
-		testSuite.addTestSuite(PostNewMBCategoryThread3MessageTest.class);
-		testSuite.addTestSuite(TearDownMBCategoryTest.class);
-		testSuite.addTestSuite(TearDownPageTest.class);
-
-		return testSuite;
-	}
-}
\ No newline at end of file
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessagequestion/AddMBCategoryMessageQuestionTest.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessagequestion/AddMBCategoryMessageQuestionTest.html
deleted file mode 100644
index 373c901436e706..00000000000000
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessagequestion/AddMBCategoryMessageQuestionTest.html
+++ /dev/null
@@ -1,183 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>AddMBCategoryMessageQuestionTest</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-<thead>
-<tr><td rowspan="1" colspan="3">AddMBCategoryMessageQuestionTest</td></tr>
-</thead><tbody>
-<tr>
-	<td>open</td>
-	<td>/web/guest/home/</td>
-	<td></td>
-</tr>
-<tr>
-	<td>waitForVisible</td>
-	<td>link=Message Boards Test Page</td>
-	<td>Message Boards Test Page</td>
-</tr>
-<tr>
-	<td>clickAtAndWait</td>
-	<td>link=Message Boards Test Page</td>
-	<td>Message Boards Test Page</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//a/strong</td>
-	<td>MB Category Name</td>
-</tr>
-<tr>
-	<td>clickAtAndWait</td>
-	<td>//a/strong</td>
-	<td>MB Category Name</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//h1[@class='header-title']/span</td>
-	<td>MB Category Name</td>
-</tr>
-<tr>
-	<td>clickAtAndWait</td>
-	<td>//input[@value='Post New Thread']</td>
-	<td>Post New Thread</td>
-</tr>
-<tr>
-	<td>type</td>
-	<td>//input[@id='_19_subject']</td>
-	<td>MB Category Thread Message Subject</td>
-</tr>
-<tr>
-	<td>waitForElementPresent</td>
-	<td>//textarea[@id='_19_editor' and @style='display: none;']</td>
-	<td>Text Area</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//span[.='Source']</td>
-	<td>Source</td>
-</tr>
-<tr>
-	<td>clickAt</td>
-	<td>//span[.='Source']</td>
-	<td>Source</td>
-</tr>
-<tr>
-	<td>waitForVisible</td>
-	<td>//a[@class='cke_button_source cke_on']</td>
-	<td>Source Button On</td>
-</tr>
-<tr>
-	<td>waitForVisible</td>
-	<td>//td[@id='cke_contents__19_editor']/textarea</td>
-	<td>CK Editor</td>
-</tr>
-<tr>
-	<td>type</td>
-	<td>//td[@id='cke_contents__19_editor']/textarea</td>
-	<td>MB Category Thread Message Body</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//span[.='Source']</td>
-	<td>Source</td>
-</tr>
-<tr>
-	<td>clickAt</td>
-	<td>//span[.='Source']</td>
-	<td>Source</td>
-</tr>
-<tr>
-	<td>waitForElementPresent</td>
-	<td>//textarea[@id='_19_editor' and @style='display: none;']</td>
-	<td>Text Area</td>
-</tr>
-<tr>
-	<td>waitForVisible</td>
-	<td>//td[@id='cke_contents__19_editor']/iframe</td>
-	<td>CK Editor</td>
-</tr>
-<tr>
-	<td>selectFrame</td>
-	<td>//td[@id='cke_contents__19_editor']/iframe</td>
-	<td>CK Editor</td>
-</tr>
-<tr>
-	<td>waitForText</td>
-	<td>//body</td>
-	<td>MB Category Thread Message Body</td>
-</tr>
-<tr>
-	<td>selectFrame</td>
-	<td>relative=top</td>
-	<td>top</td>
-</tr>
-<tr>
-	<td>assertNotChecked</td>
-	<td>//input[@id='_19_questionCheckbox']</td>
-	<td>Mark as a Question</td>
-</tr>
-<tr>
-	<td>clickAt</td>
-	<td>//input[@id='_19_questionCheckbox']</td>
-	<td>Mark as a Question</td>
-</tr>
-<tr>
-	<td>clickAtAndWait</td>
-	<td>//input[@value='Publish']</td>
-	<td>Publish</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//div[@class='portlet-msg-success']</td>
-	<td>Your request completed successfully.</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//div[@class='subject']/a/strong</td>
-	<td>MB Category Thread Message Subject</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//div[@class='thread-body']</td>
-	<td>MB Category Thread Message Body</td>
-</tr>
-<tr>
-	<td>open</td>
-	<td>/web/guest/home/</td>
-	<td></td>
-</tr>
-<tr>
-	<td>waitForVisible</td>
-	<td>link=Message Boards Test Page</td>
-	<td>Message Boards Test Page</td>
-</tr>
-<tr>
-	<td>clickAtAndWait</td>
-	<td>link=Message Boards Test Page</td>
-	<td>Message Boards Test Page</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//a/strong</td>
-	<td>MB Category Name</td>
-</tr>
-<tr>
-	<td>clickAtAndWait</td>
-	<td>//a/strong</td>
-	<td>MB Category Name</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//td[1]/a</td>
-	<td>MB Category Thread Message Subject</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//td[2]/a</td>
-	<td>Waiting for an Answer</td>
-</tr>
-</tbody></table>
-</body>
-</html>
\ No newline at end of file
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessagequestion/AddMBCategoryMessageQuestionTest.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessagequestion/AddMBCategoryMessageQuestionTest.java
deleted file mode 100644
index 5c89ea88391891..00000000000000
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessagequestion/AddMBCategoryMessageQuestionTest.java
+++ /dev/null
@@ -1,229 +0,0 @@
-/**
- * Copyright (c) 2000-2012 Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- */
-
-package com.liferay.portalweb.portlet.messageboards.mbmessage.addmbcategorymessagequestion;
-
-import com.liferay.portalweb.portal.BaseTestCase;
-import com.liferay.portalweb.portal.util.RuntimeVariables;
-
-/**
- * @author Brian Wing Shun Chan
- */
-public class AddMBCategoryMessageQuestionTest extends BaseTestCase {
-	public void testAddMBCategoryMessageQuestion() throws Exception {
-		selenium.open("/web/guest/home/");
-		loadRequiredJavaScriptModules();
-
-		for (int second = 0;; second++) {
-			if (second >= 90) {
-				fail("timeout");
-			}
-
-			try {
-				if (selenium.isVisible("link=Message Boards Test Page")) {
-					break;
-				}
-			}
-			catch (Exception e) {
-			}
-
-			Thread.sleep(1000);
-		}
-
-		selenium.clickAt("link=Message Boards Test Page",
-			RuntimeVariables.replace("Message Boards Test Page"));
-		selenium.waitForPageToLoad("30000");
-		loadRequiredJavaScriptModules();
-		assertEquals(RuntimeVariables.replace("MB Category Name"),
-			selenium.getText("//a/strong"));
-		selenium.clickAt("//a/strong",
-			RuntimeVariables.replace("MB Category Name"));
-		selenium.waitForPageToLoad("30000");
-		loadRequiredJavaScriptModules();
-		assertEquals(RuntimeVariables.replace("MB Category Name"),
-			selenium.getText("//h1[@class='header-title']/span"));
-		selenium.clickAt("//input[@value='Post New Thread']",
-			RuntimeVariables.replace("Post New Thread"));
-		selenium.waitForPageToLoad("30000");
-		loadRequiredJavaScriptModules();
-		selenium.type("//input[@id='_19_subject']",
-			RuntimeVariables.replace("MB Category Thread Message Subject"));
-
-		for (int second = 0;; second++) {
-			if (second >= 90) {
-				fail("timeout");
-			}
-
-			try {
-				if (selenium.isElementPresent(
-							"//textarea[@id='_19_editor' and @style='display: none;']")) {
-					break;
-				}
-			}
-			catch (Exception e) {
-			}
-
-			Thread.sleep(1000);
-		}
-
-		assertEquals(RuntimeVariables.replace("Source"),
-			selenium.getText("//span[.='Source']"));
-		selenium.clickAt("//span[.='Source']",
-			RuntimeVariables.replace("Source"));
-
-		for (int second = 0;; second++) {
-			if (second >= 90) {
-				fail("timeout");
-			}
-
-			try {
-				if (selenium.isVisible("//a[@class='cke_button_source cke_on']")) {
-					break;
-				}
-			}
-			catch (Exception e) {
-			}
-
-			Thread.sleep(1000);
-		}
-
-		for (int second = 0;; second++) {
-			if (second >= 90) {
-				fail("timeout");
-			}
-
-			try {
-				if (selenium.isVisible(
-							"//td[@id='cke_contents__19_editor']/textarea")) {
-					break;
-				}
-			}
-			catch (Exception e) {
-			}
-
-			Thread.sleep(1000);
-		}
-
-		selenium.type("//td[@id='cke_contents__19_editor']/textarea",
-			RuntimeVariables.replace("MB Category Thread Message Body"));
-		assertEquals(RuntimeVariables.replace("Source"),
-			selenium.getText("//span[.='Source']"));
-		selenium.clickAt("//span[.='Source']",
-			RuntimeVariables.replace("Source"));
-
-		for (int second = 0;; second++) {
-			if (second >= 90) {
-				fail("timeout");
-			}
-
-			try {
-				if (selenium.isElementPresent(
-							"//textarea[@id='_19_editor' and @style='display: none;']")) {
-					break;
-				}
-			}
-			catch (Exception e) {
-			}
-
-			Thread.sleep(1000);
-		}
-
-		for (int second = 0;; second++) {
-			if (second >= 90) {
-				fail("timeout");
-			}
-
-			try {
-				if (selenium.isVisible(
-							"//td[@id='cke_contents__19_editor']/iframe")) {
-					break;
-				}
-			}
-			catch (Exception e) {
-			}
-
-			Thread.sleep(1000);
-		}
-
-		selenium.selectFrame("//td[@id='cke_contents__19_editor']/iframe");
-
-		for (int second = 0;; second++) {
-			if (second >= 90) {
-				fail("timeout");
-			}
-
-			try {
-				if (RuntimeVariables.replace("MB Category Thread Message Body")
-										.equals(selenium.getText("//body"))) {
-					break;
-				}
-			}
-			catch (Exception e) {
-			}
-
-			Thread.sleep(1000);
-		}
-
-		selenium.selectFrame("relative=top");
-		assertFalse(selenium.isChecked("//input[@id='_19_questionCheckbox']"));
-		selenium.clickAt("//input[@id='_19_questionCheckbox']",
-			RuntimeVariables.replace("Mark as a Question"));
-		selenium.clickAt("//input[@value='Publish']",
-			RuntimeVariables.replace("Publish"));
-		selenium.waitForPageToLoad("30000");
-		loadRequiredJavaScriptModules();
-		assertEquals(RuntimeVariables.replace(
-				"Your request completed successfully."),
-			selenium.getText("//div[@class='portlet-msg-success']"));
-		assertEquals(RuntimeVariables.replace(
-				"MB Category Thread Message Subject"),
-			selenium.getText("//div[@class='subject']/a/strong"));
-		assertEquals(RuntimeVariables.replace("MB Category Thread Message Body"),
-			selenium.getText("//div[@class='thread-body']"));
-		selenium.open("/web/guest/home/");
-		loadRequiredJavaScriptModules();
-
-		for (int second = 0;; second++) {
-			if (second >= 90) {
-				fail("timeout");
-			}
-
-			try {
-				if (selenium.isVisible("link=Message Boards Test Page")) {
-					break;
-				}
-			}
-			catch (Exception e) {
-			}
-
-			Thread.sleep(1000);
-		}
-
-		selenium.clickAt("link=Message Boards Test Page",
-			RuntimeVariables.replace("Message Boards Test Page"));
-		selenium.waitForPageToLoad("30000");
-		loadRequiredJavaScriptModules();
-		assertEquals(RuntimeVariables.replace("MB Category Name"),
-			selenium.getText("//a/strong"));
-		selenium.clickAt("//a/strong",
-			RuntimeVariables.replace("MB Category Name"));
-		selenium.waitForPageToLoad("30000");
-		loadRequiredJavaScriptModules();
-		assertEquals(RuntimeVariables.replace(
-				"MB Category Thread Message Subject"),
-			selenium.getText("//td[1]/a"));
-		assertEquals(RuntimeVariables.replace("Waiting for an Answer"),
-			selenium.getText("//td[2]/a"));
-	}
-}
\ No newline at end of file
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessagereply/AddMBCategoryMessageReplyTest.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessagereply/AddMBCategoryMessageReplyTest.html
deleted file mode 100644
index 40f3f5c602662f..00000000000000
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessagereply/AddMBCategoryMessageReplyTest.html
+++ /dev/null
@@ -1,158 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>AddMBCategoryMessageReplyTest</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-<thead>
-<tr><td rowspan="1" colspan="3">AddMBCategoryMessageReplyTest</td></tr>
-</thead><tbody>
-<tr>
-	<td>open</td>
-	<td>/web/guest/home/</td>
-	<td></td>
-</tr>
-<tr>
-	<td>waitForVisible</td>
-	<td>link=Message Boards Test Page</td>
-	<td>Message Boards Test Page</td>
-</tr>
-<tr>
-	<td>clickAtAndWait</td>
-	<td>link=Message Boards Test Page</td>
-	<td>Message Boards Test Page</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//td[1]/a/strong</td>
-	<td>MB Category Name</td>
-</tr>
-<tr>
-	<td>clickAtAndWait</td>
-	<td>//td[1]/a/strong</td>
-	<td>MB Category Name</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//td[1]/a</td>
-	<td>MB Category Thread Message Subject</td>
-</tr>
-<tr>
-	<td>clickAtAndWait</td>
-	<td>//td[1]/a</td>
-	<td>MB Category Thread Message Subject</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//li[contains(.,'Reply')]/span/a/span</td>
-	<td>Reply</td>
-</tr>
-<tr>
-	<td>clickAtAndWait</td>
-	<td>//li[contains(.,'Reply')]/span/a/span</td>
-	<td>Reply</td>
-</tr>
-<tr>
-	<td>assertValue</td>
-	<td>//input[@id='_19_subject']</td>
-	<td>RE: MB Category Thread Message Subject</td>
-</tr>
-<tr>
-	<td>waitForElementPresent</td>
-	<td>//textarea[@id='_19_editor' and @style='display: none;']</td>
-	<td>Text Area</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//span[.='Source']</td>
-	<td>Source</td>
-</tr>
-<tr>
-	<td>clickAt</td>
-	<td>//span[.='Source']</td>
-	<td>Source</td>
-</tr>
-<tr>
-	<td>waitForVisible</td>
-	<td>//a[@class='cke_button_source cke_on']</td>
-	<td>Source Button On</td>
-</tr>
-<tr>
-	<td>waitForVisible</td>
-	<td>//td[@id='cke_contents__19_editor']/textarea</td>
-	<td>CK Editor</td>
-</tr>
-<tr>
-	<td>type</td>
-	<td>//td[@id='cke_contents__19_editor']/textarea</td>
-	<td>MB Category Thread Message Reply Body</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//span[.='Source']</td>
-	<td>Source</td>
-</tr>
-<tr>
-	<td>clickAt</td>
-	<td>//span[.='Source']</td>
-	<td>Source</td>
-</tr>
-<tr>
-	<td>waitForElementPresent</td>
-	<td>//textarea[@id='_19_editor' and @style='display: none;']</td>
-	<td>Text Area</td>
-</tr>
-<tr>
-	<td>waitForVisible</td>
-	<td>//td[@id='cke_contents__19_editor']/iframe</td>
-	<td>CK Editor</td>
-</tr>
-<tr>
-	<td>selectFrame</td>
-	<td>//td[@id='cke_contents__19_editor']/iframe</td>
-	<td>CK Editor</td>
-</tr>
-<tr>
-	<td>waitForText</td>
-	<td>//body</td>
-	<td>MB Category Thread Message Reply Body</td>
-</tr>
-<tr>
-	<td>selectFrame</td>
-	<td>relative=top</td>
-	<td>top</td>
-</tr>
-<tr>
-	<td>clickAtAndWait</td>
-	<td>//input[@value='Publish']</td>
-	<td>Publish</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//div[@class='portlet-msg-success']</td>
-	<td>Your request completed successfully.</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//h1[@class='header-title']</td>
-	<td>RE: MB Category Thread Message Subject</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//a/strong</td>
-	<td>RE: MB Category Thread Message Subject</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>xPath=(//div[@class='subject']/a/strong)[2]</td>
-	<td>RE: MB Category Thread Message Subject</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>xPath=(//div[@class='thread-body'])[2]</td>
-	<td>MB Category Thread Message Reply Body</td>
-</tr>
-</tbody></table>
-</body>
-</html>
\ No newline at end of file
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessagereply/AddMBCategoryMessageReplyTest.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessagereply/AddMBCategoryMessageReplyTest.java
deleted file mode 100644
index 0f928e29901898..00000000000000
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessagereply/AddMBCategoryMessageReplyTest.java
+++ /dev/null
@@ -1,207 +0,0 @@
-/**
- * Copyright (c) 2000-2012 Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- */
-
-package com.liferay.portalweb.portlet.messageboards.mbmessage.addmbcategorymessagereply;
-
-import com.liferay.portalweb.portal.BaseTestCase;
-import com.liferay.portalweb.portal.util.RuntimeVariables;
-
-/**
- * @author Brian Wing Shun Chan
- */
-public class AddMBCategoryMessageReplyTest extends BaseTestCase {
-	public void testAddMBCategoryMessageReply() throws Exception {
-		selenium.open("/web/guest/home/");
-		loadRequiredJavaScriptModules();
-
-		for (int second = 0;; second++) {
-			if (second >= 90) {
-				fail("timeout");
-			}
-
-			try {
-				if (selenium.isVisible("link=Message Boards Test Page")) {
-					break;
-				}
-			}
-			catch (Exception e) {
-			}
-
-			Thread.sleep(1000);
-		}
-
-		selenium.clickAt("link=Message Boards Test Page",
-			RuntimeVariables.replace("Message Boards Test Page"));
-		selenium.waitForPageToLoad("30000");
-		loadRequiredJavaScriptModules();
-		assertEquals(RuntimeVariables.replace("MB Category Name"),
-			selenium.getText("//td[1]/a/strong"));
-		selenium.clickAt("//td[1]/a/strong",
-			RuntimeVariables.replace("MB Category Name"));
-		selenium.waitForPageToLoad("30000");
-		loadRequiredJavaScriptModules();
-		assertEquals(RuntimeVariables.replace(
-				"MB Category Thread Message Subject"),
-			selenium.getText("//td[1]/a"));
-		selenium.clickAt("//td[1]/a",
-			RuntimeVariables.replace("MB Category Thread Message Subject"));
-		selenium.waitForPageToLoad("30000");
-		loadRequiredJavaScriptModules();
-		assertEquals(RuntimeVariables.replace("Reply"),
-			selenium.getText("//li[contains(.,'Reply')]/span/a/span"));
-		selenium.clickAt("//li[contains(.,'Reply')]/span/a/span",
-			RuntimeVariables.replace("Reply"));
-		selenium.waitForPageToLoad("30000");
-		loadRequiredJavaScriptModules();
-		assertEquals("RE: MB Category Thread Message Subject",
-			selenium.getValue("//input[@id='_19_subject']"));
-
-		for (int second = 0;; second++) {
-			if (second >= 90) {
-				fail("timeout");
-			}
-
-			try {
-				if (selenium.isElementPresent(
-							"//textarea[@id='_19_editor' and @style='display: none;']")) {
-					break;
-				}
-			}
-			catch (Exception e) {
-			}
-
-			Thread.sleep(1000);
-		}
-
-		assertEquals(RuntimeVariables.replace("Source"),
-			selenium.getText("//span[.='Source']"));
-		selenium.clickAt("//span[.='Source']",
-			RuntimeVariables.replace("Source"));
-
-		for (int second = 0;; second++) {
-			if (second >= 90) {
-				fail("timeout");
-			}
-
-			try {
-				if (selenium.isVisible("//a[@class='cke_button_source cke_on']")) {
-					break;
-				}
-			}
-			catch (Exception e) {
-			}
-
-			Thread.sleep(1000);
-		}
-
-		for (int second = 0;; second++) {
-			if (second >= 90) {
-				fail("timeout");
-			}
-
-			try {
-				if (selenium.isVisible(
-							"//td[@id='cke_contents__19_editor']/textarea")) {
-					break;
-				}
-			}
-			catch (Exception e) {
-			}
-
-			Thread.sleep(1000);
-		}
-
-		selenium.type("//td[@id='cke_contents__19_editor']/textarea",
-			RuntimeVariables.replace("MB Category Thread Message Reply Body"));
-		assertEquals(RuntimeVariables.replace("Source"),
-			selenium.getText("//span[.='Source']"));
-		selenium.clickAt("//span[.='Source']",
-			RuntimeVariables.replace("Source"));
-
-		for (int second = 0;; second++) {
-			if (second >= 90) {
-				fail("timeout");
-			}
-
-			try {
-				if (selenium.isElementPresent(
-							"//textarea[@id='_19_editor' and @style='display: none;']")) {
-					break;
-				}
-			}
-			catch (Exception e) {
-			}
-
-			Thread.sleep(1000);
-		}
-
-		for (int second = 0;; second++) {
-			if (second >= 90) {
-				fail("timeout");
-			}
-
-			try {
-				if (selenium.isVisible(
-							"//td[@id='cke_contents__19_editor']/iframe")) {
-					break;
-				}
-			}
-			catch (Exception e) {
-			}
-
-			Thread.sleep(1000);
-		}
-
-		selenium.selectFrame("//td[@id='cke_contents__19_editor']/iframe");
-
-		for (int second = 0;; second++) {
-			if (second >= 90) {
-				fail("timeout");
-			}
-
-			try {
-				if (RuntimeVariables.replace(
-							"MB Category Thread Message Reply Body")
-										.equals(selenium.getText("//body"))) {
-					break;
-				}
-			}
-			catch (Exception e) {
-			}
-
-			Thread.sleep(1000);
-		}
-
-		selenium.selectFrame("relative=top");
-		selenium.clickAt("//input[@value='Publish']",
-			RuntimeVariables.replace("Publish"));
-		selenium.waitForPageToLoad("30000");
-		loadRequiredJavaScriptModules();
-		assertEquals(RuntimeVariables.replace(
-				"Your request completed successfully."),
-			selenium.getText("//div[@class='portlet-msg-success']"));
-		assertEquals(RuntimeVariables.replace(
-				"RE: MB Category Thread Message Subject"),
-			selenium.getText("//h1[@class='header-title']"));
-		assertEquals(RuntimeVariables.replace(
-				"RE: MB Category Thread Message Subject"),
-			selenium.getText("//a/strong"));
-		assertEquals(RuntimeVariables.replace(
-				"RE: MB Category Thread Message Subject"),
-			selenium.getText("xPath=(//div[@class='subject']/a/strong)[2]"));
-		assertEquals(RuntimeVariables.replace(
-				"MB Category Thread Message Reply Body"),
-			selenium.getText("xPath=(//div[@class='thread-body'])[2]"));
-	}
-}
\ No newline at end of file
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessagereply/ViewMBCategoryMessageReplyTest.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessagereply/ViewMBCategoryMessageReplyTest.html
deleted file mode 100644
index 0656a3d6ad6b44..00000000000000
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessagereply/ViewMBCategoryMessageReplyTest.html
+++ /dev/null
@@ -1,114 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>ViewMBCategoryMessageReplyTest</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-<thead>
-<tr><td rowspan="1" colspan="3">ViewMBCategoryMessageReplyTest</td></tr>
-</thead><tbody>
-<tr>
-	<td>open</td>
-	<td>/web/guest/home/</td>
-	<td></td>
-</tr>
-<tr>
-	<td>waitForVisible</td>
-	<td>link=Message Boards Test Page</td>
-	<td>Message Boards Test Page</td>
-</tr>
-<tr>
-	<td>clickAtAndWait</td>
-	<td>link=Message Boards Test Page</td>
-	<td>Message Boards Test Page</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//td[1]/a/strong</td>
-	<td>MB Category Name</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//td[2]/a</td>
-	<td>0</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//td[3]/a</td>
-	<td>1</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//td[4]/a</td>
-	<td>2</td>
-</tr>
-<tr>
-	<td>clickAtAndWait</td>
-	<td>//td[1]/a/strong</td>
-	<td>MB Category Name</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//td[1]/a</td>
-	<td>MB Category Thread Message Subject</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//td[2]/a</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//td[3]/a</td>
-	<td>Joe Bloggs</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//td[4]/a</td>
-	<td>2</td>
-</tr>
-<tr>
-	<td>assertVisible</td>
-	<td>//td[5]/a</td>
-	<td>Views</td>
-</tr>
-<tr>
-	<td>assertPartialText</td>
-	<td>//td[6]/a</td>
-	<td>By: Joe Bloggs</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//td[7]/span/ul/li/strong/a/span</td>
-	<td>Actions</td>
-</tr>
-<tr>
-	<td>clickAtAndWait</td>
-	<td>//td[1]/a</td>
-	<td>MB Category Thread Message Subject</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//h1[@class='header-title']</td>
-	<td>MB Category Thread Message Subject</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//a/strong</td>
-	<td>MB Category Thread Message Subject</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>xPath=(//div[@class='subject']/a/strong)[2]</td>
-	<td>RE: MB Category Thread Message Subject</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>xPath=(//div[@class='thread-body'])[2]</td>
-	<td>MB Category Thread Message Reply Body</td>
-</tr>
-
-</tbody></table>
-</body>
-</html>
\ No newline at end of file
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessagereply/ViewMBCategoryMessageReplyTest.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessagereply/ViewMBCategoryMessageReplyTest.java
deleted file mode 100644
index 0ca3afbc61036b..00000000000000
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessagereply/ViewMBCategoryMessageReplyTest.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/**
- * Copyright (c) 2000-2012 Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- */
-
-package com.liferay.portalweb.portlet.messageboards.mbmessage.addmbcategorymessagereply;
-
-import com.liferay.portalweb.portal.BaseTestCase;
-import com.liferay.portalweb.portal.util.RuntimeVariables;
-
-/**
- * @author Brian Wing Shun Chan
- */
-public class ViewMBCategoryMessageReplyTest extends BaseTestCase {
-	public void testViewMBCategoryMessageReply() throws Exception {
-		selenium.open("/web/guest/home/");
-		loadRequiredJavaScriptModules();
-
-		for (int second = 0;; second++) {
-			if (second >= 90) {
-				fail("timeout");
-			}
-
-			try {
-				if (selenium.isVisible("link=Message Boards Test Page")) {
-					break;
-				}
-			}
-			catch (Exception e) {
-			}
-
-			Thread.sleep(1000);
-		}
-
-		selenium.clickAt("link=Message Boards Test Page",
-			RuntimeVariables.replace("Message Boards Test Page"));
-		selenium.waitForPageToLoad("30000");
-		loadRequiredJavaScriptModules();
-		assertEquals(RuntimeVariables.replace("MB Category Name"),
-			selenium.getText("//td[1]/a/strong"));
-		assertEquals(RuntimeVariables.replace("0"),
-			selenium.getText("//td[2]/a"));
-		assertEquals(RuntimeVariables.replace("1"),
-			selenium.getText("//td[3]/a"));
-		assertEquals(RuntimeVariables.replace("2"),
-			selenium.getText("//td[4]/a"));
-		selenium.clickAt("//td[1]/a/strong",
-			RuntimeVariables.replace("MB Category Name"));
-		selenium.waitForPageToLoad("30000");
-		loadRequiredJavaScriptModules();
-		assertEquals(RuntimeVariables.replace(
-				"MB Category Thread Message Subject"),
-			selenium.getText("//td[1]/a"));
-		assertEquals(RuntimeVariables.replace(""), selenium.getText("//td[2]/a"));
-		assertEquals(RuntimeVariables.replace("Joe Bloggs"),
-			selenium.getText("//td[3]/a"));
-		assertEquals(RuntimeVariables.replace("2"),
-			selenium.getText("//td[4]/a"));
-		assertTrue(selenium.isVisible("//td[5]/a"));
-		assertTrue(selenium.isPartialText("//td[6]/a", "By: Joe Bloggs"));
-		assertEquals(RuntimeVariables.replace("Actions"),
-			selenium.getText("//td[7]/span/ul/li/strong/a/span"));
-		selenium.clickAt("//td[1]/a",
-			RuntimeVariables.replace("MB Category Thread Message Subject"));
-		selenium.waitForPageToLoad("30000");
-		loadRequiredJavaScriptModules();
-		assertEquals(RuntimeVariables.replace(
-				"MB Category Thread Message Subject"),
-			selenium.getText("//h1[@class='header-title']"));
-		assertEquals(RuntimeVariables.replace(
-				"MB Category Thread Message Subject"),
-			selenium.getText("//a/strong"));
-		assertEquals(RuntimeVariables.replace(
-				"RE: MB Category Thread Message Subject"),
-			selenium.getText("xPath=(//div[@class='subject']/a/strong)[2]"));
-		assertEquals(RuntimeVariables.replace(
-				"MB Category Thread Message Reply Body"),
-			selenium.getText("xPath=(//div[@class='thread-body'])[2]"));
-	}
-}
\ No newline at end of file
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessagereplymultiple/AddMBCategoryMessageReply1Test.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessagereplymultiple/AddMBCategoryMessageReply1Test.html
deleted file mode 100644
index e95afc500470ff..00000000000000
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessagereplymultiple/AddMBCategoryMessageReply1Test.html
+++ /dev/null
@@ -1,163 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>AddMBCategoryMessageReply1Test</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-<thead>
-<tr><td rowspan="1" colspan="3">AddMBCategoryMessageReply1Test</td></tr>
-</thead><tbody>
-<tr>
-	<td>open</td>
-	<td>/web/guest/home/</td>
-	<td></td>
-</tr>
-<tr>
-	<td>waitForVisible</td>
-	<td>link=Message Boards Test Page</td>
-	<td>Message Boards Test Page</td>
-</tr>
-<tr>
-	<td>clickAtAndWait</td>
-	<td>link=Message Boards Test Page</td>
-	<td>Message Boards Test Page</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//td[1]/a/strong</td>
-	<td>MB Category Name</td>
-</tr>
-<tr>
-	<td>clickAtAndWait</td>
-	<td>//td[1]/a/strong</td>
-	<td>MB Category Name</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//td[1]/a</td>
-	<td>MB Category Thread Message Subject</td>
-</tr>
-<tr>
-	<td>clickAtAndWait</td>
-	<td>//td[1]/a</td>
-	<td>MB Category Thread Message Subject</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//li[contains(.,'Reply')]/span/a/span</td>
-	<td>Reply</td>
-</tr>
-<tr>
-	<td>clickAtAndWait</td>
-	<td>//li[contains(.,'Reply')]/span/a/span</td>
-	<td>Reply</td>
-</tr>
-<tr>
-	<td>assertValue</td>
-	<td>//input[@id='_19_subject']</td>
-	<td>RE: MB Category Thread Message Subject</td>
-</tr>
-<tr>
-	<td>waitForElementPresent</td>
-	<td>//textarea[@id='_19_editor' and @style='display: none;']</td>
-	<td>Text Area</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//span[.='Source']</td>
-	<td>Source</td>
-</tr>
-<tr>
-	<td>clickAt</td>
-	<td>//span[.='Source']</td>
-	<td>Source</td>
-</tr>
-<tr>
-	<td>waitForVisible</td>
-	<td>//a[@class='cke_button_source cke_on']</td>
-	<td>Source Button On</td>
-</tr>
-<tr>
-	<td>waitForVisible</td>
-	<td>//td[@id='cke_contents__19_editor']/textarea</td>
-	<td>CK Editor</td>
-</tr>
-<tr>
-	<td>type</td>
-	<td>//td[@id='cke_contents__19_editor']/textarea</td>
-	<td>MB Category Thread Message Reply1 Body</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//span[.='Source']</td>
-	<td>Source</td>
-</tr>
-<tr>
-	<td>clickAt</td>
-	<td>//span[.='Source']</td>
-	<td>Source</td>
-</tr>
-<tr>
-	<td>waitForElementPresent</td>
-	<td>//textarea[@id='_19_editor' and @style='display: none;']</td>
-	<td>Text Area</td>
-</tr>
-<tr>
-	<td>waitForVisible</td>
-	<td>//td[@id='cke_contents__19_editor']/iframe</td>
-	<td>CK Editor</td>
-</tr>
-<tr>
-	<td>selectFrame</td>
-	<td>//td[@id='cke_contents__19_editor']/iframe</td>
-	<td>CK Editor</td>
-</tr>
-<tr>
-	<td>waitForText</td>
-	<td>//body</td>
-	<td>MB Category Thread Message Reply1 Body</td>
-</tr>
-<tr>
-	<td>selectFrame</td>
-	<td>relative=top</td>
-	<td>top</td>
-</tr>
-<tr>
-	<td>selectFrame</td>
-	<td>relative=top</td>
-	<td>top</td>
-</tr>
-<tr>
-	<td>clickAtAndWait</td>
-	<td>//input[@value='Publish']</td>
-	<td>Publish</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//div[@class='portlet-msg-success']</td>
-	<td>Your request completed successfully.</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//h1[@class='header-title']</td>
-	<td>RE: MB Category Thread Message Subject</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//a/strong</td>
-	<td>RE: MB Category Thread Message Subject</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>xPath=(//div[@class='subject']/a/strong)[2]</td>
-	<td>RE: MB Category Thread Message Subject</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>xPath=(//div[@class='thread-body'])[2]</td>
-	<td>MB Category Thread Message Reply1 Body</td>
-</tr>
-</tbody></table>
-</body>
-</html>
\ No newline at end of file
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessagereplymultiple/AddMBCategoryMessageReply1Test.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessagereplymultiple/AddMBCategoryMessageReply1Test.java
deleted file mode 100644
index 11fe69e05ef87f..00000000000000
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessagereplymultiple/AddMBCategoryMessageReply1Test.java
+++ /dev/null
@@ -1,208 +0,0 @@
-/**
- * Copyright (c) 2000-2012 Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- */
-
-package com.liferay.portalweb.portlet.messageboards.mbmessage.addmbcategorymessagereplymultiple;
-
-import com.liferay.portalweb.portal.BaseTestCase;
-import com.liferay.portalweb.portal.util.RuntimeVariables;
-
-/**
- * @author Brian Wing Shun Chan
- */
-public class AddMBCategoryMessageReply1Test extends BaseTestCase {
-	public void testAddMBCategoryMessageReply1() throws Exception {
-		selenium.open("/web/guest/home/");
-		loadRequiredJavaScriptModules();
-
-		for (int second = 0;; second++) {
-			if (second >= 90) {
-				fail("timeout");
-			}
-
-			try {
-				if (selenium.isVisible("link=Message Boards Test Page")) {
-					break;
-				}
-			}
-			catch (Exception e) {
-			}
-
-			Thread.sleep(1000);
-		}
-
-		selenium.clickAt("link=Message Boards Test Page",
-			RuntimeVariables.replace("Message Boards Test Page"));
-		selenium.waitForPageToLoad("30000");
-		loadRequiredJavaScriptModules();
-		assertEquals(RuntimeVariables.replace("MB Category Name"),
-			selenium.getText("//td[1]/a/strong"));
-		selenium.clickAt("//td[1]/a/strong",
-			RuntimeVariables.replace("MB Category Name"));
-		selenium.waitForPageToLoad("30000");
-		loadRequiredJavaScriptModules();
-		assertEquals(RuntimeVariables.replace(
-				"MB Category Thread Message Subject"),
-			selenium.getText("//td[1]/a"));
-		selenium.clickAt("//td[1]/a",
-			RuntimeVariables.replace("MB Category Thread Message Subject"));
-		selenium.waitForPageToLoad("30000");
-		loadRequiredJavaScriptModules();
-		assertEquals(RuntimeVariables.replace("Reply"),
-			selenium.getText("//li[contains(.,'Reply')]/span/a/span"));
-		selenium.clickAt("//li[contains(.,'Reply')]/span/a/span",
-			RuntimeVariables.replace("Reply"));
-		selenium.waitForPageToLoad("30000");
-		loadRequiredJavaScriptModules();
-		assertEquals("RE: MB Category Thread Message Subject",
-			selenium.getValue("//input[@id='_19_subject']"));
-
-		for (int second = 0;; second++) {
-			if (second >= 90) {
-				fail("timeout");
-			}
-
-			try {
-				if (selenium.isElementPresent(
-							"//textarea[@id='_19_editor' and @style='display: none;']")) {
-					break;
-				}
-			}
-			catch (Exception e) {
-			}
-
-			Thread.sleep(1000);
-		}
-
-		assertEquals(RuntimeVariables.replace("Source"),
-			selenium.getText("//span[.='Source']"));
-		selenium.clickAt("//span[.='Source']",
-			RuntimeVariables.replace("Source"));
-
-		for (int second = 0;; second++) {
-			if (second >= 90) {
-				fail("timeout");
-			}
-
-			try {
-				if (selenium.isVisible("//a[@class='cke_button_source cke_on']")) {
-					break;
-				}
-			}
-			catch (Exception e) {
-			}
-
-			Thread.sleep(1000);
-		}
-
-		for (int second = 0;; second++) {
-			if (second >= 90) {
-				fail("timeout");
-			}
-
-			try {
-				if (selenium.isVisible(
-							"//td[@id='cke_contents__19_editor']/textarea")) {
-					break;
-				}
-			}
-			catch (Exception e) {
-			}
-
-			Thread.sleep(1000);
-		}
-
-		selenium.type("//td[@id='cke_contents__19_editor']/textarea",
-			RuntimeVariables.replace("MB Category Thread Message Reply1 Body"));
-		assertEquals(RuntimeVariables.replace("Source"),
-			selenium.getText("//span[.='Source']"));
-		selenium.clickAt("//span[.='Source']",
-			RuntimeVariables.replace("Source"));
-
-		for (int second = 0;; second++) {
-			if (second >= 90) {
-				fail("timeout");
-			}
-
-			try {
-				if (selenium.isElementPresent(
-							"//textarea[@id='_19_editor' and @style='display: none;']")) {
-					break;
-				}
-			}
-			catch (Exception e) {
-			}
-
-			Thread.sleep(1000);
-		}
-
-		for (int second = 0;; second++) {
-			if (second >= 90) {
-				fail("timeout");
-			}
-
-			try {
-				if (selenium.isVisible(
-							"//td[@id='cke_contents__19_editor']/iframe")) {
-					break;
-				}
-			}
-			catch (Exception e) {
-			}
-
-			Thread.sleep(1000);
-		}
-
-		selenium.selectFrame("//td[@id='cke_contents__19_editor']/iframe");
-
-		for (int second = 0;; second++) {
-			if (second >= 90) {
-				fail("timeout");
-			}
-
-			try {
-				if (RuntimeVariables.replace(
-							"MB Category Thread Message Reply1 Body")
-										.equals(selenium.getText("//body"))) {
-					break;
-				}
-			}
-			catch (Exception e) {
-			}
-
-			Thread.sleep(1000);
-		}
-
-		selenium.selectFrame("relative=top");
-		selenium.selectFrame("relative=top");
-		selenium.clickAt("//input[@value='Publish']",
-			RuntimeVariables.replace("Publish"));
-		selenium.waitForPageToLoad("30000");
-		loadRequiredJavaScriptModules();
-		assertEquals(RuntimeVariables.replace(
-				"Your request completed successfully."),
-			selenium.getText("//div[@class='portlet-msg-success']"));
-		assertEquals(RuntimeVariables.replace(
-				"RE: MB Category Thread Message Subject"),
-			selenium.getText("//h1[@class='header-title']"));
-		assertEquals(RuntimeVariables.replace(
-				"RE: MB Category Thread Message Subject"),
-			selenium.getText("//a/strong"));
-		assertEquals(RuntimeVariables.replace(
-				"RE: MB Category Thread Message Subject"),
-			selenium.getText("xPath=(//div[@class='subject']/a/strong)[2]"));
-		assertEquals(RuntimeVariables.replace(
-				"MB Category Thread Message Reply1 Body"),
-			selenium.getText("xPath=(//div[@class='thread-body'])[2]"));
-	}
-}
\ No newline at end of file
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessagereplymultiple/AddMBCategoryMessageReply2Test.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessagereplymultiple/AddMBCategoryMessageReply2Test.html
deleted file mode 100644
index 0a7f969b752a5c..00000000000000
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessagereplymultiple/AddMBCategoryMessageReply2Test.html
+++ /dev/null
@@ -1,168 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>AddMBCategoryMessageReply2Test</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-<thead>
-<tr><td rowspan="1" colspan="3">AddMBCategoryMessageReply2Test</td></tr>
-</thead><tbody>
-<tr>
-	<td>open</td>
-	<td>/web/guest/home/</td>
-	<td></td>
-</tr>
-<tr>
-	<td>waitForVisible</td>
-	<td>link=Message Boards Test Page</td>
-	<td>Message Boards Test Page</td>
-</tr>
-<tr>
-	<td>clickAtAndWait</td>
-	<td>link=Message Boards Test Page</td>
-	<td>Message Boards Test Page</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//a/strong</td>
-	<td>MB Category Name</td>
-</tr>
-<tr>
-	<td>clickAtAndWait</td>
-	<td>//a/strong</td>
-	<td>MB Category Name</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//td[1]/a</td>
-	<td>MB Category Thread Message Subject</td>
-</tr>
-<tr>
-	<td>clickAtAndWait</td>
-	<td>//td[1]/a</td>
-	<td>MB Category Thread Message Subject</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//li[contains(.,'Reply')]/span/a/span</td>
-	<td>Reply</td>
-</tr>
-<tr>
-	<td>clickAtAndWait</td>
-	<td>//li[contains(.,'Reply')]/span/a/span</td>
-	<td>Reply</td>
-</tr>
-<tr>
-	<td>assertValue</td>
-	<td>//input[@id='_19_subject']</td>
-	<td>RE: MB Category Thread Message Subject</td>
-</tr>
-<tr>
-	<td>waitForElementPresent</td>
-	<td>//textarea[@id='_19_editor' and @style='display: none;']</td>
-	<td>Text Area</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//span[.='Source']</td>
-	<td>Source</td>
-</tr>
-<tr>
-	<td>clickAt</td>
-	<td>//span[.='Source']</td>
-	<td>Source</td>
-</tr>
-<tr>
-	<td>waitForVisible</td>
-	<td>//a[@class='cke_button_source cke_on']</td>
-	<td>Source Button On</td>
-</tr>
-<tr>
-	<td>waitForVisible</td>
-	<td>//td[@id='cke_contents__19_editor']/textarea</td>
-	<td>CK Editor</td>
-</tr>
-<tr>
-	<td>type</td>
-	<td>//td[@id='cke_contents__19_editor']/textarea</td>
-	<td>MB Category Thread Message Reply2 Body</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//span[.='Source']</td>
-	<td>Source</td>
-</tr>
-<tr>
-	<td>clickAt</td>
-	<td>//span[.='Source']</td>
-	<td>Source</td>
-</tr>
-<tr>
-	<td>waitForElementPresent</td>
-	<td>//textarea[@id='_19_editor' and @style='display: none;']</td>
-	<td>Text Area</td>
-</tr>
-<tr>
-	<td>waitForVisible</td>
-	<td>//td[@id='cke_contents__19_editor']/iframe</td>
-	<td>CK Editor</td>
-</tr>
-<tr>
-	<td>selectFrame</td>
-	<td>//td[@id='cke_contents__19_editor']/iframe</td>
-	<td>CK Editor</td>
-</tr>
-<tr>
-	<td>waitForText</td>
-	<td>//body</td>
-	<td>MB Category Thread Message Reply2 Body</td>
-</tr>
-<tr>
-	<td>selectFrame</td>
-	<td>relative=top</td>
-	<td>top</td>
-</tr>
-<tr>
-	<td>clickAtAndWait</td>
-	<td>//input[@value='Publish']</td>
-	<td>Publish</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//div[@class='portlet-msg-success']</td>
-	<td>Your request completed successfully.</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//h1[@class='header-title']</td>
-	<td>RE: MB Category Thread Message Subject</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//a/strong</td>
-	<td>RE: MB Category Thread Message Subject</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>xPath=(//div[@class='subject']/a/strong)[2]</td>
-	<td>RE: MB Category Thread Message Subject</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>xPath=(//div[@class='thread-body'])[2]</td>
-	<td>MB Category Thread Message Reply1 Body</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>xPath=(//div[@class='subject']/a/strong)[3]</td>
-	<td>RE: MB Category Thread Message Subject</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>xPath=(//div[@class='thread-body'])[3]</td>
-	<td>MB Category Thread Message Reply2 Body</td>
-</tr>
-</tbody></table>
-</body>
-</html>
\ No newline at end of file
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessagereplymultiple/AddMBCategoryMessageReply2Test.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessagereplymultiple/AddMBCategoryMessageReply2Test.java
deleted file mode 100644
index 206d18762c6abe..00000000000000
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessagereplymultiple/AddMBCategoryMessageReply2Test.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/**
- * Copyright (c) 2000-2012 Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- */
-
-package com.liferay.portalweb.portlet.messageboards.mbmessage.addmbcategorymessagereplymultiple;
-
-import com.liferay.portalweb.portal.BaseTestCase;
-import com.liferay.portalweb.portal.util.RuntimeVariables;
-
-/**
- * @author Brian Wing Shun Chan
- */
-public class AddMBCategoryMessageReply2Test extends BaseTestCase {
-	public void testAddMBCategoryMessageReply2() throws Exception {
-		selenium.open("/web/guest/home/");
-		loadRequiredJavaScriptModules();
-
-		for (int second = 0;; second++) {
-			if (second >= 90) {
-				fail("timeout");
-			}
-
-			try {
-				if (selenium.isVisible("link=Message Boards Test Page")) {
-					break;
-				}
-			}
-			catch (Exception e) {
-			}
-
-			Thread.sleep(1000);
-		}
-
-		selenium.clickAt("link=Message Boards Test Page",
-			RuntimeVariables.replace("Message Boards Test Page"));
-		selenium.waitForPageToLoad("30000");
-		loadRequiredJavaScriptModules();
-		assertEquals(RuntimeVariables.replace("MB Category Name"),
-			selenium.getText("//a/strong"));
-		selenium.clickAt("//a/strong",
-			RuntimeVariables.replace("MB Category Name"));
-		selenium.waitForPageToLoad("30000");
-		loadRequiredJavaScriptModules();
-		assertEquals(RuntimeVariables.replace(
-				"MB Category Thread Message Subject"),
-			selenium.getText("//td[1]/a"));
-		selenium.clickAt("//td[1]/a",
-			RuntimeVariables.replace("MB Category Thread Message Subject"));
-		selenium.waitForPageToLoad("30000");
-		loadRequiredJavaScriptModules();
-		assertEquals(RuntimeVariables.replace("Reply"),
-			selenium.getText("//li[contains(.,'Reply')]/span/a/span"));
-		selenium.clickAt("//li[contains(.,'Reply')]/span/a/span",
-			RuntimeVariables.replace("Reply"));
-		selenium.waitForPageToLoad("30000");
-		loadRequiredJavaScriptModules();
-		assertEquals("RE: MB Category Thread Message Subject",
-			selenium.getValue("//input[@id='_19_subject']"));
-
-		for (int second = 0;; second++) {
-			if (second >= 90) {
-				fail("timeout");
-			}
-
-			try {
-				if (selenium.isElementPresent(
-							"//textarea[@id='_19_editor' and @style='display: none;']")) {
-					break;
-				}
-			}
-			catch (Exception e) {
-			}
-
-			Thread.sleep(1000);
-		}
-
-		assertEquals(RuntimeVariables.replace("Source"),
-			selenium.getText("//span[.='Source']"));
-		selenium.clickAt("//span[.='Source']",
-			RuntimeVariables.replace("Source"));
-
-		for (int second = 0;; second++) {
-			if (second >= 90) {
-				fail("timeout");
-			}
-
-			try {
-				if (selenium.isVisible("//a[@class='cke_button_source cke_on']")) {
-					break;
-				}
-			}
-			catch (Exception e) {
-			}
-
-			Thread.sleep(1000);
-		}
-
-		for (int second = 0;; second++) {
-			if (second >= 90) {
-				fail("timeout");
-			}
-
-			try {
-				if (selenium.isVisible(
-							"//td[@id='cke_contents__19_editor']/textarea")) {
-					break;
-				}
-			}
-			catch (Exception e) {
-			}
-
-			Thread.sleep(1000);
-		}
-
-		selenium.type("//td[@id='cke_contents__19_editor']/textarea",
-			RuntimeVariables.replace("MB Category Thread Message Reply2 Body"));
-		assertEquals(RuntimeVariables.replace("Source"),
-			selenium.getText("//span[.='Source']"));
-		selenium.clickAt("//span[.='Source']",
-			RuntimeVariables.replace("Source"));
-
-		for (int second = 0;; second++) {
-			if (second >= 90) {
-				fail("timeout");
-			}
-
-			try {
-				if (selenium.isElementPresent(
-							"//textarea[@id='_19_editor' and @style='display: none;']")) {
-					break;
-				}
-			}
-			catch (Exception e) {
-			}
-
-			Thread.sleep(1000);
-		}
-
-		for (int second = 0;; second++) {
-			if (second >= 90) {
-				fail("timeout");
-			}
-
-			try {
-				if (selenium.isVisible(
-							"//td[@id='cke_contents__19_editor']/iframe")) {
-					break;
-				}
-			}
-			catch (Exception e) {
-			}
-
-			Thread.sleep(1000);
-		}
-
-		selenium.selectFrame("//td[@id='cke_contents__19_editor']/iframe");
-
-		for (int second = 0;; second++) {
-			if (second >= 90) {
-				fail("timeout");
-			}
-
-			try {
-				if (RuntimeVariables.replace(
-							"MB Category Thread Message Reply2 Body")
-										.equals(selenium.getText("//body"))) {
-					break;
-				}
-			}
-			catch (Exception e) {
-			}
-
-			Thread.sleep(1000);
-		}
-
-		selenium.selectFrame("relative=top");
-		selenium.clickAt("//input[@value='Publish']",
-			RuntimeVariables.replace("Publish"));
-		selenium.waitForPageToLoad("30000");
-		loadRequiredJavaScriptModules();
-		assertEquals(RuntimeVariables.replace(
-				"Your request completed successfully."),
-			selenium.getText("//div[@class='portlet-msg-success']"));
-		assertEquals(RuntimeVariables.replace(
-				"RE: MB Category Thread Message Subject"),
-			selenium.getText("//h1[@class='header-title']"));
-		assertEquals(RuntimeVariables.replace(
-				"RE: MB Category Thread Message Subject"),
-			selenium.getText("//a/strong"));
-		assertEquals(RuntimeVariables.replace(
-				"RE: MB Category Thread Message Subject"),
-			selenium.getText("xPath=(//div[@class='subject']/a/strong)[2]"));
-		assertEquals(RuntimeVariables.replace(
-				"MB Category Thread Message Reply1 Body"),
-			selenium.getText("xPath=(//div[@class='thread-body'])[2]"));
-		assertEquals(RuntimeVariables.replace(
-				"RE: MB Category Thread Message Subject"),
-			selenium.getText("xPath=(//div[@class='subject']/a/strong)[3]"));
-		assertEquals(RuntimeVariables.replace(
-				"MB Category Thread Message Reply2 Body"),
-			selenium.getText("xPath=(//div[@class='thread-body'])[3]"));
-	}
-}
\ No newline at end of file
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessagereplymultiple/AddMBCategoryMessageReply3Test.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessagereplymultiple/AddMBCategoryMessageReply3Test.html
deleted file mode 100644
index b22093fc034685..00000000000000
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessagereplymultiple/AddMBCategoryMessageReply3Test.html
+++ /dev/null
@@ -1,178 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>AddMBCategoryMessageReply3Test</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-<thead>
-<tr><td rowspan="1" colspan="3">AddMBCategoryMessageReply3Test</td></tr>
-</thead><tbody>
-<tr>
-	<td>open</td>
-	<td>/web/guest/home/</td>
-	<td></td>
-</tr>
-<tr>
-	<td>waitForVisible</td>
-	<td>link=Message Boards Test Page</td>
-	<td>Message Boards Test Page</td>
-</tr>
-<tr>
-	<td>clickAtAndWait</td>
-	<td>link=Message Boards Test Page</td>
-	<td>Message Boards Test Page</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//a/strong</td>
-	<td>MB Category Name</td>
-</tr>
-<tr>
-	<td>clickAtAndWait</td>
-	<td>//a/strong</td>
-	<td>MB Category Name</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//td[1]/a</td>
-	<td>MB Category Thread Message Subject</td>
-</tr>
-<tr>
-	<td>clickAtAndWait</td>
-	<td>//td[1]/a</td>
-	<td>MB Category Thread Message Subject</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//li[contains(.,'Reply')]/span/a/span</td>
-	<td>Reply</td>
-</tr>
-<tr>
-	<td>clickAtAndWait</td>
-	<td>//li[contains(.,'Reply')]/span/a/span</td>
-	<td>Reply</td>
-</tr>
-<tr>
-	<td>assertValue</td>
-	<td>//input[@id='_19_subject']</td>
-	<td>RE: MB Category Thread Message Subject</td>
-</tr>
-<tr>
-	<td>waitForElementPresent</td>
-	<td>//textarea[@id='_19_editor' and @style='display: none;']</td>
-	<td>Text Area</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//span[.='Source']</td>
-	<td>Source</td>
-</tr>
-<tr>
-	<td>clickAt</td>
-	<td>//span[.='Source']</td>
-	<td>Source</td>
-</tr>
-<tr>
-	<td>waitForVisible</td>
-	<td>//a[@class='cke_button_source cke_on']</td>
-	<td>Source Button On</td>
-</tr>
-<tr>
-	<td>waitForVisible</td>
-	<td>//td[@id='cke_contents__19_editor']/textarea</td>
-	<td>CK Editor</td>
-</tr>
-<tr>
-	<td>type</td>
-	<td>//td[@id='cke_contents__19_editor']/textarea</td>
-	<td>MB Category Thread Message Reply3 Body</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//span[.='Source']</td>
-	<td>Source</td>
-</tr>
-<tr>
-	<td>clickAt</td>
-	<td>//span[.='Source']</td>
-	<td>Source</td>
-</tr>
-<tr>
-	<td>waitForElementPresent</td>
-	<td>//textarea[@id='_19_editor' and @style='display: none;']</td>
-	<td>Text Area</td>
-</tr>
-<tr>
-	<td>waitForVisible</td>
-	<td>//td[@id='cke_contents__19_editor']/iframe</td>
-	<td>CK Editor</td>
-</tr>
-<tr>
-	<td>selectFrame</td>
-	<td>//td[@id='cke_contents__19_editor']/iframe</td>
-	<td>CK Editor</td>
-</tr>
-<tr>
-	<td>waitForText</td>
-	<td>//body</td>
-	<td>MB Category Thread Message Reply3 Body</td>
-</tr>
-<tr>
-	<td>selectFrame</td>
-	<td>relative=top</td>
-	<td>top</td>
-</tr>
-<tr>
-	<td>clickAtAndWait</td>
-	<td>//input[@value='Publish']</td>
-	<td>Publish</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//div[@class='portlet-msg-success']</td>
-	<td>Your request completed successfully.</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//h1[@class='header-title']</td>
-	<td>RE: MB Category Thread Message Subject</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//a/strong</td>
-	<td>RE: MB Category Thread Message Subject</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>xPath=(//div[@class='subject']/a/strong)[2]</td>
-	<td>RE: MB Category Thread Message Subject</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>xPath=(//div[@class='thread-body'])[2]</td>
-	<td>MB Category Thread Message Reply1 Body</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>xPath=(//div[@class='subject']/a/strong)[3]</td>
-	<td>RE: MB Category Thread Message Subject</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>xPath=(//div[@class='thread-body'])[3]</td>
-	<td>MB Category Thread Message Reply2 Body</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>xPath=(//div[@class='subject']/a/strong)[4]</td>
-	<td>RE: MB Category Thread Message Subject</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>xPath=(//div[@class='thread-body'])[4]</td>
-	<td>MB Category Thread Message Reply3 Body</td>
-</tr>
-</tbody></table>
-</body>
-</html>
\ No newline at end of file
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessagereplymultiple/AddMBCategoryMessageReply3Test.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessagereplymultiple/AddMBCategoryMessageReply3Test.java
deleted file mode 100644
index f63fcd4c3c78c0..00000000000000
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessagereplymultiple/AddMBCategoryMessageReply3Test.java
+++ /dev/null
@@ -1,219 +0,0 @@
-/**
- * Copyright (c) 2000-2012 Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- */
-
-package com.liferay.portalweb.portlet.messageboards.mbmessage.addmbcategorymessagereplymultiple;
-
-import com.liferay.portalweb.portal.BaseTestCase;
-import com.liferay.portalweb.portal.util.RuntimeVariables;
-
-/**
- * @author Brian Wing Shun Chan
- */
-public class AddMBCategoryMessageReply3Test extends BaseTestCase {
-	public void testAddMBCategoryMessageReply3() throws Exception {
-		selenium.open("/web/guest/home/");
-		loadRequiredJavaScriptModules();
-
-		for (int second = 0;; second++) {
-			if (second >= 90) {
-				fail("timeout");
-			}
-
-			try {
-				if (selenium.isVisible("link=Message Boards Test Page")) {
-					break;
-				}
-			}
-			catch (Exception e) {
-			}
-
-			Thread.sleep(1000);
-		}
-
-		selenium.clickAt("link=Message Boards Test Page",
-			RuntimeVariables.replace("Message Boards Test Page"));
-		selenium.waitForPageToLoad("30000");
-		loadRequiredJavaScriptModules();
-		assertEquals(RuntimeVariables.replace("MB Category Name"),
-			selenium.getText("//a/strong"));
-		selenium.clickAt("//a/strong",
-			RuntimeVariables.replace("MB Category Name"));
-		selenium.waitForPageToLoad("30000");
-		loadRequiredJavaScriptModules();
-		assertEquals(RuntimeVariables.replace(
-				"MB Category Thread Message Subject"),
-			selenium.getText("//td[1]/a"));
-		selenium.clickAt("//td[1]/a",
-			RuntimeVariables.replace("MB Category Thread Message Subject"));
-		selenium.waitForPageToLoad("30000");
-		loadRequiredJavaScriptModules();
-		assertEquals(RuntimeVariables.replace("Reply"),
-			selenium.getText("//li[contains(.,'Reply')]/span/a/span"));
-		selenium.clickAt("//li[contains(.,'Reply')]/span/a/span",
-			RuntimeVariables.replace("Reply"));
-		selenium.waitForPageToLoad("30000");
-		loadRequiredJavaScriptModules();
-		assertEquals("RE: MB Category Thread Message Subject",
-			selenium.getValue("//input[@id='_19_subject']"));
-
-		for (int second = 0;; second++) {
-			if (second >= 90) {
-				fail("timeout");
-			}
-
-			try {
-				if (selenium.isElementPresent(
-							"//textarea[@id='_19_editor' and @style='display: none;']")) {
-					break;
-				}
-			}
-			catch (Exception e) {
-			}
-
-			Thread.sleep(1000);
-		}
-
-		assertEquals(RuntimeVariables.replace("Source"),
-			selenium.getText("//span[.='Source']"));
-		selenium.clickAt("//span[.='Source']",
-			RuntimeVariables.replace("Source"));
-
-		for (int second = 0;; second++) {
-			if (second >= 90) {
-				fail("timeout");
-			}
-
-			try {
-				if (selenium.isVisible("//a[@class='cke_button_source cke_on']")) {
-					break;
-				}
-			}
-			catch (Exception e) {
-			}
-
-			Thread.sleep(1000);
-		}
-
-		for (int second = 0;; second++) {
-			if (second >= 90) {
-				fail("timeout");
-			}
-
-			try {
-				if (selenium.isVisible(
-							"//td[@id='cke_contents__19_editor']/textarea")) {
-					break;
-				}
-			}
-			catch (Exception e) {
-			}
-
-			Thread.sleep(1000);
-		}
-
-		selenium.type("//td[@id='cke_contents__19_editor']/textarea",
-			RuntimeVariables.replace("MB Category Thread Message Reply3 Body"));
-		assertEquals(RuntimeVariables.replace("Source"),
-			selenium.getText("//span[.='Source']"));
-		selenium.clickAt("//span[.='Source']",
-			RuntimeVariables.replace("Source"));
-
-		for (int second = 0;; second++) {
-			if (second >= 90) {
-				fail("timeout");
-			}
-
-			try {
-				if (selenium.isElementPresent(
-							"//textarea[@id='_19_editor' and @style='display: none;']")) {
-					break;
-				}
-			}
-			catch (Exception e) {
-			}
-
-			Thread.sleep(1000);
-		}
-
-		for (int second = 0;; second++) {
-			if (second >= 90) {
-				fail("timeout");
-			}
-
-			try {
-				if (selenium.isVisible(
-							"//td[@id='cke_contents__19_editor']/iframe")) {
-					break;
-				}
-			}
-			catch (Exception e) {
-			}
-
-			Thread.sleep(1000);
-		}
-
-		selenium.selectFrame("//td[@id='cke_contents__19_editor']/iframe");
-
-		for (int second = 0;; second++) {
-			if (second >= 90) {
-				fail("timeout");
-			}
-
-			try {
-				if (RuntimeVariables.replace(
-							"MB Category Thread Message Reply3 Body")
-										.equals(selenium.getText("//body"))) {
-					break;
-				}
-			}
-			catch (Exception e) {
-			}
-
-			Thread.sleep(1000);
-		}
-
-		selenium.selectFrame("relative=top");
-		selenium.clickAt("//input[@value='Publish']",
-			RuntimeVariables.replace("Publish"));
-		selenium.waitForPageToLoad("30000");
-		loadRequiredJavaScriptModules();
-		assertEquals(RuntimeVariables.replace(
-				"Your request completed successfully."),
-			selenium.getText("//div[@class='portlet-msg-success']"));
-		assertEquals(RuntimeVariables.replace(
-				"RE: MB Category Thread Message Subject"),
-			selenium.getText("//h1[@class='header-title']"));
-		assertEquals(RuntimeVariables.replace(
-				"RE: MB Category Thread Message Subject"),
-			selenium.getText("//a/strong"));
-		assertEquals(RuntimeVariables.replace(
-				"RE: MB Category Thread Message Subject"),
-			selenium.getText("xPath=(//div[@class='subject']/a/strong)[2]"));
-		assertEquals(RuntimeVariables.replace(
-				"MB Category Thread Message Reply1 Body"),
-			selenium.getText("xPath=(//div[@class='thread-body'])[2]"));
-		assertEquals(RuntimeVariables.replace(
-				"RE: MB Category Thread Message Subject"),
-			selenium.getText("xPath=(//div[@class='subject']/a/strong)[3]"));
-		assertEquals(RuntimeVariables.replace(
-				"MB Category Thread Message Reply2 Body"),
-			selenium.getText("xPath=(//div[@class='thread-body'])[3]"));
-		assertEquals(RuntimeVariables.replace(
-				"RE: MB Category Thread Message Subject"),
-			selenium.getText("xPath=(//div[@class='subject']/a/strong)[4]"));
-		assertEquals(RuntimeVariables.replace(
-				"MB Category Thread Message Reply3 Body"),
-			selenium.getText("xPath=(//div[@class='thread-body'])[4]"));
-	}
-}
\ No newline at end of file
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessagereplymultiple/AddMBCategoryMessageReplyMultipleTests.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessagereplymultiple/AddMBCategoryMessageReplyMultipleTests.html
deleted file mode 100644
index d038eead0fa69d..00000000000000
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessagereplymultiple/AddMBCategoryMessageReplyMultipleTests.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <meta content="text/html; charset=UTF-8" http-equiv="content-type" />
-  <title>AddMBCategoryMessageReplyMultipleTests</title>
-</head>
-<body>
-<table id="suiteTable" cellpadding="1" cellspacing="1" border="1" class="selenium"><tbody>
-<tr><td><b>AddMBCategoryMessageReplyMultipleTests</b></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPageMBTest.html">AddPageMBTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPortletMBTest.html">AddPortletMBTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/AddMBCategoryTest.html">AddMBCategoryTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThreadMessageTest.html">PostNewMBCategoryThreadMessageTest</a></td></tr>
-<tr><td><a href="AddMBCategoryMessageReply1Test.html">AddMBCategoryMessageReply1Test</a></td></tr>
-<tr><td><a href="AddMBCategoryMessageReply2Test.html">AddMBCategoryMessageReply2Test</a></td></tr>
-<tr><td><a href="AddMBCategoryMessageReply3Test.html">AddMBCategoryMessageReply3Test</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/TearDownMBCategoryTest.html">TearDownMBCategoryTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portal/util/TearDownPageTest.html">TearDownPageTest</a></td></tr>
-</tbody></table>
-</body>
-</html>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessagereplymultiple/AddMBCategoryMessageReplyMultipleTests.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessagereplymultiple/AddMBCategoryMessageReplyMultipleTests.java
deleted file mode 100644
index d0b6aec300658d..00000000000000
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessagereplymultiple/AddMBCategoryMessageReplyMultipleTests.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- * Copyright (c) 2000-2012 Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- */
-
-package com.liferay.portalweb.portlet.messageboards.mbmessage.addmbcategorymessagereplymultiple;
-
-import com.liferay.portalweb.portal.BaseTestSuite;
-import com.liferay.portalweb.portal.util.TearDownPageTest;
-import com.liferay.portalweb.portlet.messageboards.mbcategory.addmbcategory.AddMBCategoryTest;
-import com.liferay.portalweb.portlet.messageboards.mbcategory.addmbcategory.TearDownMBCategoryTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbcategorythreadmessage.PostNewMBCategoryThreadMessageTest;
-import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPageMBTest;
-import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPortletMBTest;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-/**
- * @author Brian Wing Shun Chan
- */
-public class AddMBCategoryMessageReplyMultipleTests extends BaseTestSuite {
-	public static Test suite() {
-		TestSuite testSuite = new TestSuite();
-		testSuite.addTestSuite(AddPageMBTest.class);
-		testSuite.addTestSuite(AddPortletMBTest.class);
-		testSuite.addTestSuite(AddMBCategoryTest.class);
-		testSuite.addTestSuite(PostNewMBCategoryThreadMessageTest.class);
-		testSuite.addTestSuite(AddMBCategoryMessageReply1Test.class);
-		testSuite.addTestSuite(AddMBCategoryMessageReply2Test.class);
-		testSuite.addTestSuite(AddMBCategoryMessageReply3Test.class);
-		testSuite.addTestSuite(TearDownMBCategoryTest.class);
-		testSuite.addTestSuite(TearDownPageTest.class);
-
-		return testSuite;
-	}
-}
\ No newline at end of file
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbmessage/AddMBMessageTest.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbmessage/AddMBMessageTest.html
deleted file mode 100644
index 4651cf56e52e61..00000000000000
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbmessage/AddMBMessageTest.html
+++ /dev/null
@@ -1,168 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>AddMBMessageTest</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-<thead>
-<tr><td rowspan="1" colspan="3">AddMBMessageTest</td></tr>
-</thead><tbody>
-<tr>
-	<td>open</td>
-	<td>/web/guest/home/</td>
-	<td></td>
-</tr>
-<tr>
-	<td>waitForVisible</td>
-	<td>link=Message Boards Test Page</td>
-	<td>Message Boards Test Page</td>
-</tr>
-<tr>
-	<td>clickAtAndWait</td>
-	<td>link=Message Boards Test Page</td>
-	<td>Message Boards Test Page</td>
-</tr>
-<tr>
-	<td>clickAtAndWait</td>
-	<td>//input[@value='Post New Thread']</td>
-	<td>Post New Thread</td>
-</tr>
-<tr>
-	<td>type</td>
-	<td>//input[@id='_19_subject']</td>
-	<td>MB Thread Message Subject</td>
-</tr>
-<tr>
-	<td>waitForElementPresent</td>
-	<td>//textarea[@id='_19_editor' and @style='display: none;']</td>
-	<td>Text Area</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//span[.='Source']</td>
-	<td>Source</td>
-</tr>
-<tr>
-	<td>clickAt</td>
-	<td>//span[.='Source']</td>
-	<td>Source</td>
-</tr>
-<tr>
-	<td>waitForVisible</td>
-	<td>//a[@class='cke_button_source cke_on']</td>
-	<td>Source Button On</td>
-</tr>
-<tr>
-	<td>waitForVisible</td>
-	<td>//td[@id='cke_contents__19_editor']/textarea</td>
-	<td>CK Editor</td>
-</tr>
-<tr>
-	<td>type</td>
-	<td>//td[@id='cke_contents__19_editor']/textarea</td>
-	<td>MB Thread Message Body</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//span[.='Source']</td>
-	<td>Source</td>
-</tr>
-<tr>
-	<td>clickAt</td>
-	<td>//span[.='Source']</td>
-	<td>Source</td>
-</tr>
-<tr>
-	<td>waitForElementPresent</td>
-	<td>//textarea[@id='_19_editor' and @style='display: none;']</td>
-	<td>Text Area</td>
-</tr>
-<tr>
-	<td>waitForVisible</td>
-	<td>//td[@id='cke_contents__19_editor']/iframe</td>
-	<td>CK Editor</td>
-</tr>
-<tr>
-	<td>selectFrame</td>
-	<td>//td[@id='cke_contents__19_editor']/iframe</td>
-	<td>CK Editor</td>
-</tr>
-<tr>
-	<td>waitForText</td>
-	<td>//body</td>
-	<td>MB Thread Message Body</td>
-</tr>
-<tr>
-	<td>selectFrame</td>
-	<td>relative=top</td>
-	<td>top</td>
-</tr>
-<tr>
-	<td>clickAtAndWait</td>
-	<td>//input[@value='Publish']</td>
-	<td>Publish</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//div[@class='portlet-msg-success']</td>
-	<td>Your request completed successfully.</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//h1[@class='header-title']/span</td>
-	<td>MB Thread Message Subject</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//div[@class='thread-body']</td>
-	<td>MB Thread Message Body</td>
-</tr>
-<tr>
-	<td>open</td>
-	<td>/web/guest/home/</td>
-	<td></td>
-</tr>
-<tr>
-	<td>waitForVisible</td>
-	<td>link=Message Boards Test Page</td>
-	<td>Message Boards Test Page</td>
-</tr>
-<tr>
-	<td>clickAtAndWait</td>
-	<td>link=Message Boards Test Page</td>
-	<td>Message Boards Test Page</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//td/a</td>
-	<td>MB Thread Message Subject</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//td[2]/a</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//td[3]/a</td>
-	<td>Joe Bloggs</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//td[4]/a</td>
-	<td>1</td>
-</tr>
-<tr>
-	<td>assertVisible</td>
-	<td>//td[5]/a</td>
-	<td>Views</td>
-</tr>
-<tr>
-	<td>assertPartialText</td>
-	<td>//td[6]/a</td>
-	<td>By: Joe Bloggs</td>
-</tr>
-</tbody></table>
-</body>
-</html>
\ No newline at end of file
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbmessage/AddMBMessageTest.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbmessage/AddMBMessageTest.java
deleted file mode 100644
index 936e85960b8ea5..00000000000000
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbmessage/AddMBMessageTest.java
+++ /dev/null
@@ -1,215 +0,0 @@
-/**
- * Copyright (c) 2000-2012 Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- */
-
-package com.liferay.portalweb.portlet.messageboards.mbmessage.addmbmessage;
-
-import com.liferay.portalweb.portal.BaseTestCase;
-import com.liferay.portalweb.portal.util.RuntimeVariables;
-
-/**
- * @author Brian Wing Shun Chan
- */
-public class AddMBMessageTest extends BaseTestCase {
-	public void testAddMBMessage() throws Exception {
-		selenium.open("/web/guest/home/");
-		loadRequiredJavaScriptModules();
-
-		for (int second = 0;; second++) {
-			if (second >= 90) {
-				fail("timeout");
-			}
-
-			try {
-				if (selenium.isVisible("link=Message Boards Test Page")) {
-					break;
-				}
-			}
-			catch (Exception e) {
-			}
-
-			Thread.sleep(1000);
-		}
-
-		selenium.clickAt("link=Message Boards Test Page",
-			RuntimeVariables.replace("Message Boards Test Page"));
-		selenium.waitForPageToLoad("30000");
-		loadRequiredJavaScriptModules();
-		selenium.clickAt("//input[@value='Post New Thread']",
-			RuntimeVariables.replace("Post New Thread"));
-		selenium.waitForPageToLoad("30000");
-		loadRequiredJavaScriptModules();
-		selenium.type("//input[@id='_19_subject']",
-			RuntimeVariables.replace("MB Thread Message Subject"));
-
-		for (int second = 0;; second++) {
-			if (second >= 90) {
-				fail("timeout");
-			}
-
-			try {
-				if (selenium.isElementPresent(
-							"//textarea[@id='_19_editor' and @style='display: none;']")) {
-					break;
-				}
-			}
-			catch (Exception e) {
-			}
-
-			Thread.sleep(1000);
-		}
-
-		assertEquals(RuntimeVariables.replace("Source"),
-			selenium.getText("//span[.='Source']"));
-		selenium.clickAt("//span[.='Source']",
-			RuntimeVariables.replace("Source"));
-
-		for (int second = 0;; second++) {
-			if (second >= 90) {
-				fail("timeout");
-			}
-
-			try {
-				if (selenium.isVisible("//a[@class='cke_button_source cke_on']")) {
-					break;
-				}
-			}
-			catch (Exception e) {
-			}
-
-			Thread.sleep(1000);
-		}
-
-		for (int second = 0;; second++) {
-			if (second >= 90) {
-				fail("timeout");
-			}
-
-			try {
-				if (selenium.isVisible(
-							"//td[@id='cke_contents__19_editor']/textarea")) {
-					break;
-				}
-			}
-			catch (Exception e) {
-			}
-
-			Thread.sleep(1000);
-		}
-
-		selenium.type("//td[@id='cke_contents__19_editor']/textarea",
-			RuntimeVariables.replace("MB Thread Message Body"));
-		assertEquals(RuntimeVariables.replace("Source"),
-			selenium.getText("//span[.='Source']"));
-		selenium.clickAt("//span[.='Source']",
-			RuntimeVariables.replace("Source"));
-
-		for (int second = 0;; second++) {
-			if (second >= 90) {
-				fail("timeout");
-			}
-
-			try {
-				if (selenium.isElementPresent(
-							"//textarea[@id='_19_editor' and @style='display: none;']")) {
-					break;
-				}
-			}
-			catch (Exception e) {
-			}
-
-			Thread.sleep(1000);
-		}
-
-		for (int second = 0;; second++) {
-			if (second >= 90) {
-				fail("timeout");
-			}
-
-			try {
-				if (selenium.isVisible(
-							"//td[@id='cke_contents__19_editor']/iframe")) {
-					break;
-				}
-			}
-			catch (Exception e) {
-			}
-
-			Thread.sleep(1000);
-		}
-
-		selenium.selectFrame("//td[@id='cke_contents__19_editor']/iframe");
-
-		for (int second = 0;; second++) {
-			if (second >= 90) {
-				fail("timeout");
-			}
-
-			try {
-				if (RuntimeVariables.replace("MB Thread Message Body")
-										.equals(selenium.getText("//body"))) {
-					break;
-				}
-			}
-			catch (Exception e) {
-			}
-
-			Thread.sleep(1000);
-		}
-
-		selenium.selectFrame("relative=top");
-		selenium.clickAt("//input[@value='Publish']",
-			RuntimeVariables.replace("Publish"));
-		selenium.waitForPageToLoad("30000");
-		loadRequiredJavaScriptModules();
-		assertEquals(RuntimeVariables.replace(
-				"Your request completed successfully."),
-			selenium.getText("//div[@class='portlet-msg-success']"));
-		assertEquals(RuntimeVariables.replace("MB Thread Message Subject"),
-			selenium.getText("//h1[@class='header-title']/span"));
-		assertEquals(RuntimeVariables.replace("MB Thread Message Body"),
-			selenium.getText("//div[@class='thread-body']"));
-		selenium.open("/web/guest/home/");
-		loadRequiredJavaScriptModules();
-
-		for (int second = 0;; second++) {
-			if (second >= 90) {
-				fail("timeout");
-			}
-
-			try {
-				if (selenium.isVisible("link=Message Boards Test Page")) {
-					break;
-				}
-			}
-			catch (Exception e) {
-			}
-
-			Thread.sleep(1000);
-		}
-
-		selenium.clickAt("link=Message Boards Test Page",
-			RuntimeVariables.replace("Message Boards Test Page"));
-		selenium.waitForPageToLoad("30000");
-		loadRequiredJavaScriptModules();
-		assertEquals(RuntimeVariables.replace("MB Thread Message Subject"),
-			selenium.getText("//td/a"));
-		assertEquals(RuntimeVariables.replace(""), selenium.getText("//td[2]/a"));
-		assertEquals(RuntimeVariables.replace("Joe Bloggs"),
-			selenium.getText("//td[3]/a"));
-		assertEquals(RuntimeVariables.replace("1"),
-			selenium.getText("//td[4]/a"));
-		assertTrue(selenium.isVisible("//td[5]/a"));
-		assertTrue(selenium.isPartialText("//td[6]/a", "By: Joe Bloggs"));
-	}
-}
\ No newline at end of file
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbsubcategorymessagemultiple/AddMBSubcategoryMessageMultipleTests.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbsubcategorymessagemultiple/AddMBSubcategoryMessageMultipleTests.html
deleted file mode 100644
index fb20f27cf0d1dc..00000000000000
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbsubcategorymessagemultiple/AddMBSubcategoryMessageMultipleTests.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <meta content="text/html; charset=UTF-8" http-equiv="content-type" />
-  <title>AddMBSubcategoryMessageMultipleTests</title>
-</head>
-<body>
-<table id="suiteTable" cellpadding="1" cellspacing="1" border="1" class="selenium"><tbody>
-<tr><td><b>AddMBSubcategoryMessageMultipleTests</b></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPageMBTest.html">AddPageMBTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPortletMBTest.html">AddPortletMBTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/AddMBCategoryTest.html">AddMBCategoryTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/addmbsubcategorymessage/AddMBSubcategoryTest.html">AddMBSubcategoryTest</a></td></tr>
-<tr><td><a href="AddMBSubcategoryMessage1Test.html">AddMBSubcategoryMessage1Test</a></td></tr>
-<tr><td><a href="AddMBSubcategoryMessage2Test.html">AddMBSubcategoryMessage2Test</a></td></tr>
-<tr><td><a href="AddMBSubcategoryMessage3Test.html">AddMBSubcategoryMessage3Test</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/TearDownMBCategoryTest.html">TearDownMBCategoryTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portal/util/TearDownPageTest.html">TearDownPageTest</a></td></tr>
-</tbody></table>
-</body>
-</html>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/deletemarkasanswermbcategorymessagereply/AddMBCategoryMessageQuestionReplyTest.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/deletemarkasanswermbcategorymessagereply/AddMBCategoryMessageQuestionReplyTest.html
deleted file mode 100644
index 4fabd30657b9d7..00000000000000
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/deletemarkasanswermbcategorymessagereply/AddMBCategoryMessageQuestionReplyTest.html
+++ /dev/null
@@ -1,193 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>AddMBCategoryMessageQuestionReplyTest</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-<thead>
-<tr><td rowspan="1" colspan="3">AddMBCategoryMessageQuestionReplyTest</td></tr>
-</thead><tbody>
-<tr>
-	<td>open</td>
-	<td>/web/guest/home/</td>
-	<td></td>
-</tr>
-<tr>
-	<td>waitForVisible</td>
-	<td>link=Message Boards Test Page</td>
-	<td>Message Boards Test Page</td>
-</tr>
-<tr>
-	<td>clickAtAndWait</td>
-	<td>link=Message Boards Test Page</td>
-	<td>Message Boards Test Page</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//a/strong</td>
-	<td>MB Category Name</td>
-</tr>
-<tr>
-	<td>clickAtAndWait</td>
-	<td>//a/strong</td>
-	<td>MB Category Name</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//td[1]/a</td>
-	<td>MB Category Thread Message Subject</td>
-</tr>
-<tr>
-	<td>clickAtAndWait</td>
-	<td>//td[1]/a</td>
-	<td>MB Category Thread Message Subject</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//li[contains(.,'Reply')]/span/a/span</td>
-	<td>Reply</td>
-</tr>
-<tr>
-	<td>clickAtAndWait</td>
-	<td>//li[contains(.,'Reply')]/span/a/span</td>
-	<td>Reply</td>
-</tr>
-<tr>
-	<td>assertValue</td>
-	<td>//input[@id='_19_subject']</td>
-	<td>RE: MB Category Thread Message Subject</td>
-</tr>
-<tr>
-	<td>waitForElementPresent</td>
-	<td>//textarea[@id='_19_editor' and @style='display: none;']</td>
-	<td>Text Area</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//span[.='Source']</td>
-	<td>Source</td>
-</tr>
-<tr>
-	<td>clickAt</td>
-	<td>//span[.='Source']</td>
-	<td>Source</td>
-</tr>
-<tr>
-	<td>waitForVisible</td>
-	<td>//a[@class='cke_button_source cke_on']</td>
-	<td>Source Button On</td>
-</tr>
-<tr>
-	<td>waitForVisible</td>
-	<td>//td[@id='cke_contents__19_editor']/textarea</td>
-	<td>CK Editor</td>
-</tr>
-<tr>
-	<td>type</td>
-	<td>//td[@id='cke_contents__19_editor']/textarea</td>
-	<td>MB Category Thread Message Reply Body</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//span[.='Source']</td>
-	<td>Source</td>
-</tr>
-<tr>
-	<td>clickAt</td>
-	<td>//span[.='Source']</td>
-	<td>Source</td>
-</tr>
-<tr>
-	<td>waitForElementPresent</td>
-	<td>//textarea[@id='_19_editor' and @style='display: none;']</td>
-	<td>Text Area</td>
-</tr>
-<tr>
-	<td>waitForVisible</td>
-	<td>//td[@id='cke_contents__19_editor']/iframe</td>
-	<td>CK Editor</td>
-</tr>
-<tr>
-	<td>selectFrame</td>
-	<td>//td[@id='cke_contents__19_editor']/iframe</td>
-	<td>CK Editor</td>
-</tr>
-<tr>
-	<td>waitForText</td>
-	<td>//body</td>
-	<td>MB Category Thread Message Reply Body</td>
-</tr>
-<tr>
-	<td>selectFrame</td>
-	<td>relative=top</td>
-	<td>top</td>
-</tr>
-<tr>
-	<td>clickAtAndWait</td>
-	<td>//input[@value='Publish']</td>
-	<td>Publish</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//h1[@class='header-title']</td>
-	<td>RE: MB Category Thread Message Subject</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//a/strong</td>
-	<td>RE: MB Category Thread Message Subject</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>xPath=(//div[@class='subject']/a/strong)[2]</td>
-	<td>RE: MB Category Thread Message Subject</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//div[5]/table/tbody/tr[1]/td[2]/div[1]/ul/li[1]/span/a/span</td>
-	<td>Mark as an Answer</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>xPath=(//div[@class='thread-body'])[2]</td>
-	<td>MB Category Thread Message Reply Body</td>
-</tr>
-<tr>
-	<td>open</td>
-	<td>/web/guest/home/</td>
-	<td></td>
-</tr>
-<tr>
-	<td>waitForVisible</td>
-	<td>link=Message Boards Test Page</td>
-	<td>Message Boards Test Page</td>
-</tr>
-<tr>
-	<td>clickAtAndWait</td>
-	<td>link=Message Boards Test Page</td>
-	<td>Message Boards Test Page</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//a/strong</td>
-	<td>MB Category Name</td>
-</tr>
-<tr>
-	<td>clickAtAndWait</td>
-	<td>//a/strong</td>
-	<td>MB Category Name</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//td[1]/a</td>
-	<td>MB Category Thread Message Subject</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//td[2]/a</td>
-	<td>Waiting for an Answer</td>
-</tr>
-</tbody></table>
-</body>
-</html>
\ No newline at end of file
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/deletemarkasanswermbcategorymessagereply/AddMBCategoryMessageQuestionReplyTest.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/deletemarkasanswermbcategorymessagereply/AddMBCategoryMessageQuestionReplyTest.java
deleted file mode 100644
index 9ac19fcae54798..00000000000000
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/deletemarkasanswermbcategorymessagereply/AddMBCategoryMessageQuestionReplyTest.java
+++ /dev/null
@@ -1,242 +0,0 @@
-/**
- * Copyright (c) 2000-2012 Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- */
-
-package com.liferay.portalweb.portlet.messageboards.mbmessage.deletemarkasanswermbcategorymessagereply;
-
-import com.liferay.portalweb.portal.BaseTestCase;
-import com.liferay.portalweb.portal.util.RuntimeVariables;
-
-/**
- * @author Brian Wing Shun Chan
- */
-public class AddMBCategoryMessageQuestionReplyTest extends BaseTestCase {
-	public void testAddMBCategoryMessageQuestionReply()
-		throws Exception {
-		selenium.open("/web/guest/home/");
-		loadRequiredJavaScriptModules();
-
-		for (int second = 0;; second++) {
-			if (second >= 90) {
-				fail("timeout");
-			}
-
-			try {
-				if (selenium.isVisible("link=Message Boards Test Page")) {
-					break;
-				}
-			}
-			catch (Exception e) {
-			}
-
-			Thread.sleep(1000);
-		}
-
-		selenium.clickAt("link=Message Boards Test Page",
-			RuntimeVariables.replace("Message Boards Test Page"));
-		selenium.waitForPageToLoad("30000");
-		loadRequiredJavaScriptModules();
-		assertEquals(RuntimeVariables.replace("MB Category Name"),
-			selenium.getText("//a/strong"));
-		selenium.clickAt("//a/strong",
-			RuntimeVariables.replace("MB Category Name"));
-		selenium.waitForPageToLoad("30000");
-		loadRequiredJavaScriptModules();
-		assertEquals(RuntimeVariables.replace(
-				"MB Category Thread Message Subject"),
-			selenium.getText("//td[1]/a"));
-		selenium.clickAt("//td[1]/a",
-			RuntimeVariables.replace("MB Category Thread Message Subject"));
-		selenium.waitForPageToLoad("30000");
-		loadRequiredJavaScriptModules();
-		assertEquals(RuntimeVariables.replace("Reply"),
-			selenium.getText("//li[contains(.,'Reply')]/span/a/span"));
-		selenium.clickAt("//li[contains(.,'Reply')]/span/a/span",
-			RuntimeVariables.replace("Reply"));
-		selenium.waitForPageToLoad("30000");
-		loadRequiredJavaScriptModules();
-		assertEquals("RE: MB Category Thread Message Subject",
-			selenium.getValue("//input[@id='_19_subject']"));
-
-		for (int second = 0;; second++) {
-			if (second >= 90) {
-				fail("timeout");
-			}
-
-			try {
-				if (selenium.isElementPresent(
-							"//textarea[@id='_19_editor' and @style='display: none;']")) {
-					break;
-				}
-			}
-			catch (Exception e) {
-			}
-
-			Thread.sleep(1000);
-		}
-
-		assertEquals(RuntimeVariables.replace("Source"),
-			selenium.getText("//span[.='Source']"));
-		selenium.clickAt("//span[.='Source']",
-			RuntimeVariables.replace("Source"));
-
-		for (int second = 0;; second++) {
-			if (second >= 90) {
-				fail("timeout");
-			}
-
-			try {
-				if (selenium.isVisible("//a[@class='cke_button_source cke_on']")) {
-					break;
-				}
-			}
-			catch (Exception e) {
-			}
-
-			Thread.sleep(1000);
-		}
-
-		for (int second = 0;; second++) {
-			if (second >= 90) {
-				fail("timeout");
-			}
-
-			try {
-				if (selenium.isVisible(
-							"//td[@id='cke_contents__19_editor']/textarea")) {
-					break;
-				}
-			}
-			catch (Exception e) {
-			}
-
-			Thread.sleep(1000);
-		}
-
-		selenium.type("//td[@id='cke_contents__19_editor']/textarea",
-			RuntimeVariables.replace("MB Category Thread Message Reply Body"));
-		assertEquals(RuntimeVariables.replace("Source"),
-			selenium.getText("//span[.='Source']"));
-		selenium.clickAt("//span[.='Source']",
-			RuntimeVariables.replace("Source"));
-
-		for (int second = 0;; second++) {
-			if (second >= 90) {
-				fail("timeout");
-			}
-
-			try {
-				if (selenium.isElementPresent(
-							"//textarea[@id='_19_editor' and @style='display: none;']")) {
-					break;
-				}
-			}
-			catch (Exception e) {
-			}
-
-			Thread.sleep(1000);
-		}
-
-		for (int second = 0;; second++) {
-			if (second >= 90) {
-				fail("timeout");
-			}
-
-			try {
-				if (selenium.isVisible(
-							"//td[@id='cke_contents__19_editor']/iframe")) {
-					break;
-				}
-			}
-			catch (Exception e) {
-			}
-
-			Thread.sleep(1000);
-		}
-
-		selenium.selectFrame("//td[@id='cke_contents__19_editor']/iframe");
-
-		for (int second = 0;; second++) {
-			if (second >= 90) {
-				fail("timeout");
-			}
-
-			try {
-				if (RuntimeVariables.replace(
-							"MB Category Thread Message Reply Body")
-										.equals(selenium.getText("//body"))) {
-					break;
-				}
-			}
-			catch (Exception e) {
-			}
-
-			Thread.sleep(1000);
-		}
-
-		selenium.selectFrame("relative=top");
-		selenium.clickAt("//input[@value='Publish']",
-			RuntimeVariables.replace("Publish"));
-		selenium.waitForPageToLoad("30000");
-		loadRequiredJavaScriptModules();
-		assertEquals(RuntimeVariables.replace(
-				"RE: MB Category Thread Message Subject"),
-			selenium.getText("//h1[@class='header-title']"));
-		assertEquals(RuntimeVariables.replace(
-				"RE: MB Category Thread Message Subject"),
-			selenium.getText("//a/strong"));
-		assertEquals(RuntimeVariables.replace(
-				"RE: MB Category Thread Message Subject"),
-			selenium.getText("xPath=(//div[@class='subject']/a/strong)[2]"));
-		assertEquals(RuntimeVariables.replace("Mark as an Answer"),
-			selenium.getText(
-				"//div[5]/table/tbody/tr[1]/td[2]/div[1]/ul/li[1]/span/a/span"));
-		assertEquals(RuntimeVariables.replace(
-				"MB Category Thread Message Reply Body"),
-			selenium.getText("xPath=(//div[@class='thread-body'])[2]"));
-		selenium.open("/web/guest/home/");
-		loadRequiredJavaScriptModules();
-
-		for (int second = 0;; second++) {
-			if (second >= 90) {
-				fail("timeout");
-			}
-
-			try {
-				if (selenium.isVisible("link=Message Boards Test Page")) {
-					break;
-				}
-			}
-			catch (Exception e) {
-			}
-
-			Thread.sleep(1000);
-		}
-
-		selenium.clickAt("link=Message Boards Test Page",
-			RuntimeVariables.replace("Message Boards Test Page"));
-		selenium.waitForPageToLoad("30000");
-		loadRequiredJavaScriptModules();
-		assertEquals(RuntimeVariables.replace("MB Category Name"),
-			selenium.getText("//a/strong"));
-		selenium.clickAt("//a/strong",
-			RuntimeVariables.replace("MB Category Name"));
-		selenium.waitForPageToLoad("30000");
-		loadRequiredJavaScriptModules();
-		assertEquals(RuntimeVariables.replace(
-				"MB Category Thread Message Subject"),
-			selenium.getText("//td[1]/a"));
-		assertEquals(RuntimeVariables.replace("Waiting for an Answer"),
-			selenium.getText("//td[2]/a"));
-	}
-}
\ No newline at end of file
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/deletemarkasanswermbcategorymessagereply/AddMBCategoryMessageQuestionTest.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/deletemarkasanswermbcategorymessagereply/AddMBCategoryMessageQuestionTest.html
deleted file mode 100644
index 373c901436e706..00000000000000
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/deletemarkasanswermbcategorymessagereply/AddMBCategoryMessageQuestionTest.html
+++ /dev/null
@@ -1,183 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>AddMBCategoryMessageQuestionTest</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-<thead>
-<tr><td rowspan="1" colspan="3">AddMBCategoryMessageQuestionTest</td></tr>
-</thead><tbody>
-<tr>
-	<td>open</td>
-	<td>/web/guest/home/</td>
-	<td></td>
-</tr>
-<tr>
-	<td>waitForVisible</td>
-	<td>link=Message Boards Test Page</td>
-	<td>Message Boards Test Page</td>
-</tr>
-<tr>
-	<td>clickAtAndWait</td>
-	<td>link=Message Boards Test Page</td>
-	<td>Message Boards Test Page</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//a/strong</td>
-	<td>MB Category Name</td>
-</tr>
-<tr>
-	<td>clickAtAndWait</td>
-	<td>//a/strong</td>
-	<td>MB Category Name</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//h1[@class='header-title']/span</td>
-	<td>MB Category Name</td>
-</tr>
-<tr>
-	<td>clickAtAndWait</td>
-	<td>//input[@value='Post New Thread']</td>
-	<td>Post New Thread</td>
-</tr>
-<tr>
-	<td>type</td>
-	<td>//input[@id='_19_subject']</td>
-	<td>MB Category Thread Message Subject</td>
-</tr>
-<tr>
-	<td>waitForElementPresent</td>
-	<td>//textarea[@id='_19_editor' and @style='display: none;']</td>
-	<td>Text Area</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//span[.='Source']</td>
-	<td>Source</td>
-</tr>
-<tr>
-	<td>clickAt</td>
-	<td>//span[.='Source']</td>
-	<td>Source</td>
-</tr>
-<tr>
-	<td>waitForVisible</td>
-	<td>//a[@class='cke_button_source cke_on']</td>
-	<td>Source Button On</td>
-</tr>
-<tr>
-	<td>waitForVisible</td>
-	<td>//td[@id='cke_contents__19_editor']/textarea</td>
-	<td>CK Editor</td>
-</tr>
-<tr>
-	<td>type</td>
-	<td>//td[@id='cke_contents__19_editor']/textarea</td>
-	<td>MB Category Thread Message Body</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//span[.='Source']</td>
-	<td>Source</td>
-</tr>
-<tr>
-	<td>clickAt</td>
-	<td>//span[.='Source']</td>
-	<td>Source</td>
-</tr>
-<tr>
-	<td>waitForElementPresent</td>
-	<td>//textarea[@id='_19_editor' and @style='display: none;']</td>
-	<td>Text Area</td>
-</tr>
-<tr>
-	<td>waitForVisible</td>
-	<td>//td[@id='cke_contents__19_editor']/iframe</td>
-	<td>CK Editor</td>
-</tr>
-<tr>
-	<td>selectFrame</td>
-	<td>//td[@id='cke_contents__19_editor']/iframe</td>
-	<td>CK Editor</td>
-</tr>
-<tr>
-	<td>waitForText</td>
-	<td>//body</td>
-	<td>MB Category Thread Message Body</td>
-</tr>
-<tr>
-	<td>selectFrame</td>
-	<td>relative=top</td>
-	<td>top</td>
-</tr>
-<tr>
-	<td>assertNotChecked</td>
-	<td>//input[@id='_19_questionCheckbox']</td>
-	<td>Mark as a Question</td>
-</tr>
-<tr>
-	<td>clickAt</td>
-	<td>//input[@id='_19_questionCheckbox']</td>
-	<td>Mark as a Question</td>
-</tr>
-<tr>
-	<td>clickAtAndWait</td>
-	<td>//input[@value='Publish']</td>
-	<td>Publish</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//div[@class='portlet-msg-success']</td>
-	<td>Your request completed successfully.</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//div[@class='subject']/a/strong</td>
-	<td>MB Category Thread Message Subject</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//div[@class='thread-body']</td>
-	<td>MB Category Thread Message Body</td>
-</tr>
-<tr>
-	<td>open</td>
-	<td>/web/guest/home/</td>
-	<td></td>
-</tr>
-<tr>
-	<td>waitForVisible</td>
-	<td>link=Message Boards Test Page</td>
-	<td>Message Boards Test Page</td>
-</tr>
-<tr>
-	<td>clickAtAndWait</td>
-	<td>link=Message Boards Test Page</td>
-	<td>Message Boards Test Page</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//a/strong</td>
-	<td>MB Category Name</td>
-</tr>
-<tr>
-	<td>clickAtAndWait</td>
-	<td>//a/strong</td>
-	<td>MB Category Name</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//td[1]/a</td>
-	<td>MB Category Thread Message Subject</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//td[2]/a</td>
-	<td>Waiting for an Answer</td>
-</tr>
-</tbody></table>
-</body>
-</html>
\ No newline at end of file
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/deletemarkasanswermbcategorymessagereply/AddMBCategoryMessageQuestionTest.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/deletemarkasanswermbcategorymessagereply/AddMBCategoryMessageQuestionTest.java
deleted file mode 100644
index 1a20f6fb937fc3..00000000000000
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/deletemarkasanswermbcategorymessagereply/AddMBCategoryMessageQuestionTest.java
+++ /dev/null
@@ -1,229 +0,0 @@
-/**
- * Copyright (c) 2000-2012 Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- */
-
-package com.liferay.portalweb.portlet.messageboards.mbmessage.deletemarkasanswermbcategorymessagereply;
-
-import com.liferay.portalweb.portal.BaseTestCase;
-import com.liferay.portalweb.portal.util.RuntimeVariables;
-
-/**
- * @author Brian Wing Shun Chan
- */
-public class AddMBCategoryMessageQuestionTest extends BaseTestCase {
-	public void testAddMBCategoryMessageQuestion() throws Exception {
-		selenium.open("/web/guest/home/");
-		loadRequiredJavaScriptModules();
-
-		for (int second = 0;; second++) {
-			if (second >= 90) {
-				fail("timeout");
-			}
-
-			try {
-				if (selenium.isVisible("link=Message Boards Test Page")) {
-					break;
-				}
-			}
-			catch (Exception e) {
-			}
-
-			Thread.sleep(1000);
-		}
-
-		selenium.clickAt("link=Message Boards Test Page",
-			RuntimeVariables.replace("Message Boards Test Page"));
-		selenium.waitForPageToLoad("30000");
-		loadRequiredJavaScriptModules();
-		assertEquals(RuntimeVariables.replace("MB Category Name"),
-			selenium.getText("//a/strong"));
-		selenium.clickAt("//a/strong",
-			RuntimeVariables.replace("MB Category Name"));
-		selenium.waitForPageToLoad("30000");
-		loadRequiredJavaScriptModules();
-		assertEquals(RuntimeVariables.replace("MB Category Name"),
-			selenium.getText("//h1[@class='header-title']/span"));
-		selenium.clickAt("//input[@value='Post New Thread']",
-			RuntimeVariables.replace("Post New Thread"));
-		selenium.waitForPageToLoad("30000");
-		loadRequiredJavaScriptModules();
-		selenium.type("//input[@id='_19_subject']",
-			RuntimeVariables.replace("MB Category Thread Message Subject"));
-
-		for (int second = 0;; second++) {
-			if (second >= 90) {
-				fail("timeout");
-			}
-
-			try {
-				if (selenium.isElementPresent(
-							"//textarea[@id='_19_editor' and @style='display: none;']")) {
-					break;
-				}
-			}
-			catch (Exception e) {
-			}
-
-			Thread.sleep(1000);
-		}
-
-		assertEquals(RuntimeVariables.replace("Source"),
-			selenium.getText("//span[.='Source']"));
-		selenium.clickAt("//span[.='Source']",
-			RuntimeVariables.replace("Source"));
-
-		for (int second = 0;; second++) {
-			if (second >= 90) {
-				fail("timeout");
-			}
-
-			try {
-				if (selenium.isVisible("//a[@class='cke_button_source cke_on']")) {
-					break;
-				}
-			}
-			catch (Exception e) {
-			}
-
-			Thread.sleep(1000);
-		}
-
-		for (int second = 0;; second++) {
-			if (second >= 90) {
-				fail("timeout");
-			}
-
-			try {
-				if (selenium.isVisible(
-							"//td[@id='cke_contents__19_editor']/textarea")) {
-					break;
-				}
-			}
-			catch (Exception e) {
-			}
-
-			Thread.sleep(1000);
-		}
-
-		selenium.type("//td[@id='cke_contents__19_editor']/textarea",
-			RuntimeVariables.replace("MB Category Thread Message Body"));
-		assertEquals(RuntimeVariables.replace("Source"),
-			selenium.getText("//span[.='Source']"));
-		selenium.clickAt("//span[.='Source']",
-			RuntimeVariables.replace("Source"));
-
-		for (int second = 0;; second++) {
-			if (second >= 90) {
-				fail("timeout");
-			}
-
-			try {
-				if (selenium.isElementPresent(
-							"//textarea[@id='_19_editor' and @style='display: none;']")) {
-					break;
-				}
-			}
-			catch (Exception e) {
-			}
-
-			Thread.sleep(1000);
-		}
-
-		for (int second = 0;; second++) {
-			if (second >= 90) {
-				fail("timeout");
-			}
-
-			try {
-				if (selenium.isVisible(
-							"//td[@id='cke_contents__19_editor']/iframe")) {
-					break;
-				}
-			}
-			catch (Exception e) {
-			}
-
-			Thread.sleep(1000);
-		}
-
-		selenium.selectFrame("//td[@id='cke_contents__19_editor']/iframe");
-
-		for (int second = 0;; second++) {
-			if (second >= 90) {
-				fail("timeout");
-			}
-
-			try {
-				if (RuntimeVariables.replace("MB Category Thread Message Body")
-										.equals(selenium.getText("//body"))) {
-					break;
-				}
-			}
-			catch (Exception e) {
-			}
-
-			Thread.sleep(1000);
-		}
-
-		selenium.selectFrame("relative=top");
-		assertFalse(selenium.isChecked("//input[@id='_19_questionCheckbox']"));
-		selenium.clickAt("//input[@id='_19_questionCheckbox']",
-			RuntimeVariables.replace("Mark as a Question"));
-		selenium.clickAt("//input[@value='Publish']",
-			RuntimeVariables.replace("Publish"));
-		selenium.waitForPageToLoad("30000");
-		loadRequiredJavaScriptModules();
-		assertEquals(RuntimeVariables.replace(
-				"Your request completed successfully."),
-			selenium.getText("//div[@class='portlet-msg-success']"));
-		assertEquals(RuntimeVariables.replace(
-				"MB Category Thread Message Subject"),
-			selenium.getText("//div[@class='subject']/a/strong"));
-		assertEquals(RuntimeVariables.replace("MB Category Thread Message Body"),
-			selenium.getText("//div[@class='thread-body']"));
-		selenium.open("/web/guest/home/");
-		loadRequiredJavaScriptModules();
-
-		for (int second = 0;; second++) {
-			if (second >= 90) {
-				fail("timeout");
-			}
-
-			try {
-				if (selenium.isVisible("link=Message Boards Test Page")) {
-					break;
-				}
-			}
-			catch (Exception e) {
-			}
-
-			Thread.sleep(1000);
-		}
-
-		selenium.clickAt("link=Message Boards Test Page",
-			RuntimeVariables.replace("Message Boards Test Page"));
-		selenium.waitForPageToLoad("30000");
-		loadRequiredJavaScriptModules();
-		assertEquals(RuntimeVariables.replace("MB Category Name"),
-			selenium.getText("//a/strong"));
-		selenium.clickAt("//a/strong",
-			RuntimeVariables.replace("MB Category Name"));
-		selenium.waitForPageToLoad("30000");
-		loadRequiredJavaScriptModules();
-		assertEquals(RuntimeVariables.replace(
-				"MB Category Thread Message Subject"),
-			selenium.getText("//td[1]/a"));
-		assertEquals(RuntimeVariables.replace("Waiting for an Answer"),
-			selenium.getText("//td[2]/a"));
-	}
-}
\ No newline at end of file
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/deletemarkasanswermbcategorymessagereply/DeleteMarkAsAnswerMBCategoryMessageReplyTests.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/deletemarkasanswermbcategorymessagereply/DeleteMarkAsAnswerMBCategoryMessageReplyTests.html
deleted file mode 100644
index d129fca7134c1f..00000000000000
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/deletemarkasanswermbcategorymessagereply/DeleteMarkAsAnswerMBCategoryMessageReplyTests.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <meta content="text/html; charset=UTF-8" http-equiv="content-type" />
-  <title>DeleteMarkAsAnswerMBCategoryMessageReplyTests</title>
-</head>
-<body>
-<table id="suiteTable" cellpadding="1" cellspacing="1" border="1" class="selenium"><tbody>
-<tr><td><b>DeleteMarkAsAnswerMBCategoryMessageReplyTests</b></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPageMBTest.html">AddPageMBTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPortletMBTest.html">AddPortletMBTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/AddMBCategoryTest.html">AddMBCategoryTest</a></td></tr>
-<tr><td><a href="AddMBCategoryMessageQuestionTest.html">AddMBCategoryMessageQuestionTest</a></td></tr>
-<tr><td><a href="AddMBCategoryMessageQuestionReplyTest.html">AddMBCategoryMessageQuestionReplyTest</a></td></tr>
-<tr><td><a href="MarkAsAnswerMBCategoryMessageQuestionReplyTest.html">MarkAsAnswerMBCategoryMessageQuestionReplyTest</a></td></tr>
-<tr><td><a href="DeleteMarkAsAnswerMBCategoryMessageReplyTest.html">DeleteMarkAsAnswerMBCategoryMessageReplyTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/TearDownMBCategoryTest.html">TearDownMBCategoryTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portal/util/TearDownPageTest.html">TearDownPageTest</a></td></tr>
-</tbody></table>
-</body>
-</html>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/deletemarkasanswermbcategorymessagereply/DeleteMarkAsAnswerMBCategoryMessageReplyTests.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/deletemarkasanswermbcategorymessagereply/DeleteMarkAsAnswerMBCategoryMessageReplyTests.java
deleted file mode 100644
index b0f7d223a060c2..00000000000000
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/deletemarkasanswermbcategorymessagereply/DeleteMarkAsAnswerMBCategoryMessageReplyTests.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- * Copyright (c) 2000-2012 Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- */
-
-package com.liferay.portalweb.portlet.messageboards.mbmessage.deletemarkasanswermbcategorymessagereply;
-
-import com.liferay.portalweb.portal.BaseTestSuite;
-import com.liferay.portalweb.portal.util.TearDownPageTest;
-import com.liferay.portalweb.portlet.messageboards.mbcategory.addmbcategory.AddMBCategoryTest;
-import com.liferay.portalweb.portlet.messageboards.mbcategory.addmbcategory.TearDownMBCategoryTest;
-import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPageMBTest;
-import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPortletMBTest;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-/**
- * @author Brian Wing Shun Chan
- */
-public class DeleteMarkAsAnswerMBCategoryMessageReplyTests extends BaseTestSuite {
-	public static Test suite() {
-		TestSuite testSuite = new TestSuite();
-		testSuite.addTestSuite(AddPageMBTest.class);
-		testSuite.addTestSuite(AddPortletMBTest.class);
-		testSuite.addTestSuite(AddMBCategoryTest.class);
-		testSuite.addTestSuite(AddMBCategoryMessageQuestionTest.class);
-		testSuite.addTestSuite(AddMBCategoryMessageQuestionReplyTest.class);
-		testSuite.addTestSuite(MarkAsAnswerMBCategoryMessageQuestionReplyTest.class);
-		testSuite.addTestSuite(DeleteMarkAsAnswerMBCategoryMessageReplyTest.class);
-		testSuite.addTestSuite(TearDownMBCategoryTest.class);
-		testSuite.addTestSuite(TearDownPageTest.class);
-
-		return testSuite;
-	}
-}
\ No newline at end of file
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/deletemarkasanswermbcategorymessagereply/MarkAsAnswerMBCategoryMessageQuestionReplyTest.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/deletemarkasanswermbcategorymessagereply/MarkAsAnswerMBCategoryMessageQuestionReplyTest.java
deleted file mode 100644
index d72f457f5a5b7c..00000000000000
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/deletemarkasanswermbcategorymessagereply/MarkAsAnswerMBCategoryMessageQuestionReplyTest.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/**
- * Copyright (c) 2000-2012 Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- */
-
-package com.liferay.portalweb.portlet.messageboards.mbmessage.deletemarkasanswermbcategorymessagereply;
-
-import com.liferay.portalweb.portal.BaseTestCase;
-import com.liferay.portalweb.portal.util.RuntimeVariables;
-
-/**
- * @author Brian Wing Shun Chan
- */
-public class MarkAsAnswerMBCategoryMessageQuestionReplyTest extends BaseTestCase {
-	public void testMarkAsAnswerMBCategoryMessageQuestionReply()
-		throws Exception {
-		selenium.open("/web/guest/home/");
-		loadRequiredJavaScriptModules();
-
-		for (int second = 0;; second++) {
-			if (second >= 90) {
-				fail("timeout");
-			}
-
-			try {
-				if (selenium.isVisible("link=Message Boards Test Page")) {
-					break;
-				}
-			}
-			catch (Exception e) {
-			}
-
-			Thread.sleep(1000);
-		}
-
-		selenium.clickAt("link=Message Boards Test Page",
-			RuntimeVariables.replace("Message Boards Test Page"));
-		selenium.waitForPageToLoad("30000");
-		loadRequiredJavaScriptModules();
-		assertEquals(RuntimeVariables.replace("MB Category Name"),
-			selenium.getText("//a/strong"));
-		selenium.clickAt("//a/strong",
-			RuntimeVariables.replace("MB Category Name"));
-		selenium.waitForPageToLoad("30000");
-		loadRequiredJavaScriptModules();
-		assertEquals(RuntimeVariables.replace(
-				"MB Category Thread Message Subject"),
-			selenium.getText("//td[1]/a"));
-		assertEquals(RuntimeVariables.replace("Waiting for an Answer"),
-			selenium.getText("//td[2]/a"));
-		selenium.clickAt("//td[1]/a",
-			RuntimeVariables.replace("MB Category Thread Message Subject"));
-		selenium.waitForPageToLoad("30000");
-		loadRequiredJavaScriptModules();
-		assertEquals(RuntimeVariables.replace("Mark as an Answer"),
-			selenium.getText(
-				"//div[5]/table/tbody/tr[1]/td[2]/div[1]/ul/li[1]/span/a/span"));
-		selenium.clickAt("//div[5]/table/tbody/tr[1]/td[2]/div[1]/ul/li[1]/span/a/span",
-			RuntimeVariables.replace("Mark as an Answer"));
-
-		for (int second = 0;; second++) {
-			if (second >= 90) {
-				fail("timeout");
-			}
-
-			try {
-				if (!selenium.isVisible(
-							"//div[5]/table/tbody/tr[1]/td[2]/div[1]/ul/li[1]/span/a/span")) {
-					break;
-				}
-			}
-			catch (Exception e) {
-			}
-
-			Thread.sleep(1000);
-		}
-
-		assertFalse(selenium.isVisible(
-				"//div[5]/table/tbody/tr[1]/td[2]/div[1]/ul/li[1]/span/a/span"));
-		assertEquals(RuntimeVariables.replace("Answer"),
-			selenium.getText(
-				"//div[5]/table/tbody/tr[1]/td[2]/div[1]/div/div[2]/span/span"));
-		assertEquals(RuntimeVariables.replace("Unmark"),
-			selenium.getText(
-				"//div[5]/table/tbody/tr[1]/td[2]/div[1]/div/div[2]/a"));
-		selenium.open("/web/guest/home/");
-		loadRequiredJavaScriptModules();
-
-		for (int second = 0;; second++) {
-			if (second >= 90) {
-				fail("timeout");
-			}
-
-			try {
-				if (selenium.isVisible("link=Message Boards Test Page")) {
-					break;
-				}
-			}
-			catch (Exception e) {
-			}
-
-			Thread.sleep(1000);
-		}
-
-		selenium.clickAt("link=Message Boards Test Page",
-			RuntimeVariables.replace("Message Boards Test Page"));
-		selenium.waitForPageToLoad("30000");
-		loadRequiredJavaScriptModules();
-		assertEquals(RuntimeVariables.replace("MB Category Name"),
-			selenium.getText("//a/strong"));
-		selenium.clickAt("//a/strong",
-			RuntimeVariables.replace("MB Category Name"));
-		selenium.waitForPageToLoad("30000");
-		loadRequiredJavaScriptModules();
-		assertEquals(RuntimeVariables.replace(
-				"MB Category Thread Message Subject"),
-			selenium.getText("//td[1]/a"));
-		assertEquals(RuntimeVariables.replace("Resolved"),
-			selenium.getText("//td[2]/a"));
-		assertNotEquals(RuntimeVariables.replace("Waiting for an Answer"),
-			selenium.getText("//td[2]/a"));
-	}
-}
\ No newline at end of file
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/deletembcategorymessage/DeleteMBCategoryMessageTests.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/deletembcategorymessage/DeleteMBCategoryMessageTests.html
deleted file mode 100644
index 0e0cf1c31cfc9b..00000000000000
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/deletembcategorymessage/DeleteMBCategoryMessageTests.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <meta content="text/html; charset=UTF-8" http-equiv="content-type" />
-  <title>DeleteMBCategoryMessageTests</title>
-</head>
-<body>
-<table id="suiteTable" cellpadding="1" cellspacing="1" border="1" class="selenium"><tbody>
-<tr><td><b>DeleteMBCategoryMessageTests</b></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPageMBTest.html">AddPageMBTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPortletMBTest.html">AddPortletMBTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/AddMBCategoryTest.html">AddMBCategoryTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThreadMessageTest.html">PostNewMBCategoryThreadMessageTest</a></td></tr>
-<tr><td><a href="DeleteMBCategoryMessageTest.html">DeleteMBCategoryMessageTest</a></td></tr>
-<tr><td><a href="ViewDeleteMBCategoryMessageTest.html">ViewDeleteMBCategoryMessageTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/TearDownMBCategoryTest.html">TearDownMBCategoryTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portal/util/TearDownPageTest.html">TearDownPageTest</a></td></tr>
-</tbody></table>
-</body>
-</html>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/deletembcategorymessage/DeleteMBCategoryMessageTests.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/deletembcategorymessage/DeleteMBCategoryMessageTests.java
deleted file mode 100644
index 4fa39529e46dbb..00000000000000
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/deletembcategorymessage/DeleteMBCategoryMessageTests.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- * Copyright (c) 2000-2012 Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- */
-
-package com.liferay.portalweb.portlet.messageboards.mbmessage.deletembcategorymessage;
-
-import com.liferay.portalweb.portal.BaseTestSuite;
-import com.liferay.portalweb.portal.util.TearDownPageTest;
-import com.liferay.portalweb.portlet.messageboards.mbcategory.addmbcategory.AddMBCategoryTest;
-import com.liferay.portalweb.portlet.messageboards.mbcategory.addmbcategory.TearDownMBCategoryTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbcategorythreadmessage.PostNewMBCategoryThreadMessageTest;
-import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPageMBTest;
-import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPortletMBTest;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-/**
- * @author Brian Wing Shun Chan
- */
-public class DeleteMBCategoryMessageTests extends BaseTestSuite {
-	public static Test suite() {
-		TestSuite testSuite = new TestSuite();
-		testSuite.addTestSuite(AddPageMBTest.class);
-		testSuite.addTestSuite(AddPortletMBTest.class);
-		testSuite.addTestSuite(AddMBCategoryTest.class);
-		testSuite.addTestSuite(PostNewMBCategoryThreadMessageTest.class);
-		testSuite.addTestSuite(DeleteMBCategoryMessageTest.class);
-		testSuite.addTestSuite(ViewDeleteMBCategoryMessageTest.class);
-		testSuite.addTestSuite(TearDownMBCategoryTest.class);
-		testSuite.addTestSuite(TearDownPageTest.class);
-
-		return testSuite;
-	}
-}
\ No newline at end of file
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/editmbcategorymessagebody/EditMBCategoryMessageBodyTests.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/editmbcategorymessagebody/EditMBCategoryMessageBodyTests.java
deleted file mode 100644
index 8bf0d45cd6f2fa..00000000000000
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/editmbcategorymessagebody/EditMBCategoryMessageBodyTests.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * Copyright (c) 2000-2012 Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- */
-
-package com.liferay.portalweb.portlet.messageboards.mbmessage.editmbcategorymessagebody;
-
-import com.liferay.portalweb.portal.BaseTestSuite;
-import com.liferay.portalweb.portal.util.TearDownPageTest;
-import com.liferay.portalweb.portlet.messageboards.mbcategory.addmbcategory.AddMBCategoryTest;
-import com.liferay.portalweb.portlet.messageboards.mbcategory.addmbcategory.TearDownMBCategoryTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbcategorythreadmessage.PostNewMBCategoryThreadMessageTest;
-import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPageMBTest;
-import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPortletMBTest;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-/**
- * @author Brian Wing Shun Chan
- */
-public class EditMBCategoryMessageBodyTests extends BaseTestSuite {
-	public static Test suite() {
-		TestSuite testSuite = new TestSuite();
-		testSuite.addTestSuite(AddPageMBTest.class);
-		testSuite.addTestSuite(AddPortletMBTest.class);
-		testSuite.addTestSuite(AddMBCategoryTest.class);
-		testSuite.addTestSuite(PostNewMBCategoryThreadMessageTest.class);
-		testSuite.addTestSuite(EditMBCategoryMessageBodyTest.class);
-		testSuite.addTestSuite(TearDownMBCategoryTest.class);
-		testSuite.addTestSuite(TearDownPageTest.class);
-
-		return testSuite;
-	}
-}
\ No newline at end of file
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/editmbcategorymessagebodynull/EditMBCategoryMessageBodyNullTests.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/editmbcategorymessagebodynull/EditMBCategoryMessageBodyNullTests.html
deleted file mode 100644
index 66fe57d7bcb6d9..00000000000000
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/editmbcategorymessagebodynull/EditMBCategoryMessageBodyNullTests.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <meta content="text/html; charset=UTF-8" http-equiv="content-type" />
-  <title>EditMBCategoryMessageBodyNullTests</title>
-</head>
-<body>
-<table id="suiteTable" cellpadding="1" cellspacing="1" border="1" class="selenium"><tbody>
-<tr><td><b>EditMBCategoryMessageBodyNullTests</b></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPageMBTest.html">AddPageMBTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPortletMBTest.html">AddPortletMBTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/AddMBCategoryTest.html">AddMBCategoryTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThreadMessageTest.html">PostNewMBCategoryThreadMessageTest</a></td></tr>
-<tr><td><a href="EditMBCategoryMessageBodyNullTest.html">EditMBCategoryMessageBodyNullTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/TearDownMBCategoryTest.html">TearDownMBCategoryTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portal/util/TearDownPageTest.html">TearDownPageTest</a></td></tr>
-</tbody></table>
-</body>
-</html>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/editmbcategorymessagesubject/EditMBCategoryMessageSubjectTests.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/editmbcategorymessagesubject/EditMBCategoryMessageSubjectTests.html
deleted file mode 100644
index 986a8a291dfdf7..00000000000000
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/editmbcategorymessagesubject/EditMBCategoryMessageSubjectTests.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <meta content="text/html; charset=UTF-8" http-equiv="content-type" />
-  <title>EditMBCategoryMessageSubjectTests</title>
-</head>
-<body>
-<table id="suiteTable" cellpadding="1" cellspacing="1" border="1" class="selenium"><tbody>
-<tr><td><b>EditMBCategoryMessageSubjectTests</b></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPageMBTest.html">AddPageMBTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPortletMBTest.html">AddPortletMBTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/AddMBCategoryTest.html">AddMBCategoryTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThreadMessageTest.html">PostNewMBCategoryThreadMessageTest</a></td></tr>
-<tr><td><a href="EditMBCategoryMessageSubjectTest.html">EditMBCategoryMessageSubjectTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/TearDownMBCategoryTest.html">TearDownMBCategoryTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portal/util/TearDownPageTest.html">TearDownPageTest</a></td></tr>
-</tbody></table>
-</body>
-</html>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/editmbcategorymessagesubjectnull/EditMBCategoryMessageSubjectNullTests.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/editmbcategorymessagesubjectnull/EditMBCategoryMessageSubjectNullTests.html
deleted file mode 100644
index 2fa7ceba3bf341..00000000000000
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/editmbcategorymessagesubjectnull/EditMBCategoryMessageSubjectNullTests.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <meta content="text/html; charset=UTF-8" http-equiv="content-type" />
-  <title>EditMBCategoryMessageSubjectNullTests</title>
-</head>
-<body>
-<table id="suiteTable" cellpadding="1" cellspacing="1" border="1" class="selenium"><tbody>
-<tr><td><b>EditMBCategoryMessageSubjectNullTests</b></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPageMBTest.html">AddPageMBTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPortletMBTest.html">AddPortletMBTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/AddMBCategoryTest.html">AddMBCategoryTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThreadMessageTest.html">PostNewMBCategoryThreadMessageTest</a></td></tr>
-<tr><td><a href="EditMBCategoryMessageSubjectNullTest.html">EditMBCategoryMessageSubjectNullTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/TearDownMBCategoryTest.html">TearDownMBCategoryTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portal/util/TearDownPageTest.html">TearDownPageTest</a></td></tr>
-</tbody></table>
-</body>
-</html>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/markasanswermbcategorymessagequestionreply/AddMBCategoryMessageQuestionReplyTest.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/markasanswermbcategorymessagequestionreply/AddMBCategoryMessageQuestionReplyTest.java
deleted file mode 100644
index c9bd0faf05537e..00000000000000
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/markasanswermbcategorymessagequestionreply/AddMBCategoryMessageQuestionReplyTest.java
+++ /dev/null
@@ -1,242 +0,0 @@
-/**
- * Copyright (c) 2000-2012 Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- */
-
-package com.liferay.portalweb.portlet.messageboards.mbmessage.markasanswermbcategorymessagequestionreply;
-
-import com.liferay.portalweb.portal.BaseTestCase;
-import com.liferay.portalweb.portal.util.RuntimeVariables;
-
-/**
- * @author Brian Wing Shun Chan
- */
-public class AddMBCategoryMessageQuestionReplyTest extends BaseTestCase {
-	public void testAddMBCategoryMessageQuestionReply()
-		throws Exception {
-		selenium.open("/web/guest/home/");
-		loadRequiredJavaScriptModules();
-
-		for (int second = 0;; second++) {
-			if (second >= 90) {
-				fail("timeout");
-			}
-
-			try {
-				if (selenium.isVisible("link=Message Boards Test Page")) {
-					break;
-				}
-			}
-			catch (Exception e) {
-			}
-
-			Thread.sleep(1000);
-		}
-
-		selenium.clickAt("link=Message Boards Test Page",
-			RuntimeVariables.replace("Message Boards Test Page"));
-		selenium.waitForPageToLoad("30000");
-		loadRequiredJavaScriptModules();
-		assertEquals(RuntimeVariables.replace("MB Category Name"),
-			selenium.getText("//a/strong"));
-		selenium.clickAt("//a/strong",
-			RuntimeVariables.replace("MB Category Name"));
-		selenium.waitForPageToLoad("30000");
-		loadRequiredJavaScriptModules();
-		assertEquals(RuntimeVariables.replace(
-				"MB Category Thread Message Subject"),
-			selenium.getText("//td[1]/a"));
-		selenium.clickAt("//td[1]/a",
-			RuntimeVariables.replace("MB Category Thread Message Subject"));
-		selenium.waitForPageToLoad("30000");
-		loadRequiredJavaScriptModules();
-		assertEquals(RuntimeVariables.replace("Reply"),
-			selenium.getText("//li[contains(.,'Reply')]/span/a/span"));
-		selenium.clickAt("//li[contains(.,'Reply')]/span/a/span",
-			RuntimeVariables.replace("Reply"));
-		selenium.waitForPageToLoad("30000");
-		loadRequiredJavaScriptModules();
-		assertEquals("RE: MB Category Thread Message Subject",
-			selenium.getValue("//input[@id='_19_subject']"));
-
-		for (int second = 0;; second++) {
-			if (second >= 90) {
-				fail("timeout");
-			}
-
-			try {
-				if (selenium.isElementPresent(
-							"//textarea[@id='_19_editor' and @style='display: none;']")) {
-					break;
-				}
-			}
-			catch (Exception e) {
-			}
-
-			Thread.sleep(1000);
-		}
-
-		assertEquals(RuntimeVariables.replace("Source"),
-			selenium.getText("//span[.='Source']"));
-		selenium.clickAt("//span[.='Source']",
-			RuntimeVariables.replace("Source"));
-
-		for (int second = 0;; second++) {
-			if (second >= 90) {
-				fail("timeout");
-			}
-
-			try {
-				if (selenium.isVisible("//a[@class='cke_button_source cke_on']")) {
-					break;
-				}
-			}
-			catch (Exception e) {
-			}
-
-			Thread.sleep(1000);
-		}
-
-		for (int second = 0;; second++) {
-			if (second >= 90) {
-				fail("timeout");
-			}
-
-			try {
-				if (selenium.isVisible(
-							"//td[@id='cke_contents__19_editor']/textarea")) {
-					break;
-				}
-			}
-			catch (Exception e) {
-			}
-
-			Thread.sleep(1000);
-		}
-
-		selenium.type("//td[@id='cke_contents__19_editor']/textarea",
-			RuntimeVariables.replace("MB Category Thread Message Reply Body"));
-		assertEquals(RuntimeVariables.replace("Source"),
-			selenium.getText("//span[.='Source']"));
-		selenium.clickAt("//span[.='Source']",
-			RuntimeVariables.replace("Source"));
-
-		for (int second = 0;; second++) {
-			if (second >= 90) {
-				fail("timeout");
-			}
-
-			try {
-				if (selenium.isElementPresent(
-							"//textarea[@id='_19_editor' and @style='display: none;']")) {
-					break;
-				}
-			}
-			catch (Exception e) {
-			}
-
-			Thread.sleep(1000);
-		}
-
-		for (int second = 0;; second++) {
-			if (second >= 90) {
-				fail("timeout");
-			}
-
-			try {
-				if (selenium.isVisible(
-							"//td[@id='cke_contents__19_editor']/iframe")) {
-					break;
-				}
-			}
-			catch (Exception e) {
-			}
-
-			Thread.sleep(1000);
-		}
-
-		selenium.selectFrame("//td[@id='cke_contents__19_editor']/iframe");
-
-		for (int second = 0;; second++) {
-			if (second >= 90) {
-				fail("timeout");
-			}
-
-			try {
-				if (RuntimeVariables.replace(
-							"MB Category Thread Message Reply Body")
-										.equals(selenium.getText("//body"))) {
-					break;
-				}
-			}
-			catch (Exception e) {
-			}
-
-			Thread.sleep(1000);
-		}
-
-		selenium.selectFrame("relative=top");
-		selenium.clickAt("//input[@value='Publish']",
-			RuntimeVariables.replace("Publish"));
-		selenium.waitForPageToLoad("30000");
-		loadRequiredJavaScriptModules();
-		assertEquals(RuntimeVariables.replace(
-				"RE: MB Category Thread Message Subject"),
-			selenium.getText("//h1[@class='header-title']"));
-		assertEquals(RuntimeVariables.replace(
-				"RE: MB Category Thread Message Subject"),
-			selenium.getText("//a/strong"));
-		assertEquals(RuntimeVariables.replace(
-				"RE: MB Category Thread Message Subject"),
-			selenium.getText("xPath=(//div[@class='subject']/a/strong)[2]"));
-		assertEquals(RuntimeVariables.replace("Mark as an Answer"),
-			selenium.getText(
-				"//div[5]/table/tbody/tr[1]/td[2]/div[1]/ul/li[1]/span/a/span"));
-		assertEquals(RuntimeVariables.replace(
-				"MB Category Thread Message Reply Body"),
-			selenium.getText("xPath=(//div[@class='thread-body'])[2]"));
-		selenium.open("/web/guest/home/");
-		loadRequiredJavaScriptModules();
-
-		for (int second = 0;; second++) {
-			if (second >= 90) {
-				fail("timeout");
-			}
-
-			try {
-				if (selenium.isVisible("link=Message Boards Test Page")) {
-					break;
-				}
-			}
-			catch (Exception e) {
-			}
-
-			Thread.sleep(1000);
-		}
-
-		selenium.clickAt("link=Message Boards Test Page",
-			RuntimeVariables.replace("Message Boards Test Page"));
-		selenium.waitForPageToLoad("30000");
-		loadRequiredJavaScriptModules();
-		assertEquals(RuntimeVariables.replace("MB Category Name"),
-			selenium.getText("//a/strong"));
-		selenium.clickAt("//a/strong",
-			RuntimeVariables.replace("MB Category Name"));
-		selenium.waitForPageToLoad("30000");
-		loadRequiredJavaScriptModules();
-		assertEquals(RuntimeVariables.replace(
-				"MB Category Thread Message Subject"),
-			selenium.getText("//td[1]/a"));
-		assertEquals(RuntimeVariables.replace("Waiting for an Answer"),
-			selenium.getText("//td[2]/a"));
-	}
-}
\ No newline at end of file
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/markasanswermbcategorymessagequestionreply/AddMBCategoryMessageQuestionTest.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/markasanswermbcategorymessagequestionreply/AddMBCategoryMessageQuestionTest.java
deleted file mode 100644
index eccf072af38155..00000000000000
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/markasanswermbcategorymessagequestionreply/AddMBCategoryMessageQuestionTest.java
+++ /dev/null
@@ -1,229 +0,0 @@
-/**
- * Copyright (c) 2000-2012 Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- */
-
-package com.liferay.portalweb.portlet.messageboards.mbmessage.markasanswermbcategorymessagequestionreply;
-
-import com.liferay.portalweb.portal.BaseTestCase;
-import com.liferay.portalweb.portal.util.RuntimeVariables;
-
-/**
- * @author Brian Wing Shun Chan
- */
-public class AddMBCategoryMessageQuestionTest extends BaseTestCase {
-	public void testAddMBCategoryMessageQuestion() throws Exception {
-		selenium.open("/web/guest/home/");
-		loadRequiredJavaScriptModules();
-
-		for (int second = 0;; second++) {
-			if (second >= 90) {
-				fail("timeout");
-			}
-
-			try {
-				if (selenium.isVisible("link=Message Boards Test Page")) {
-					break;
-				}
-			}
-			catch (Exception e) {
-			}
-
-			Thread.sleep(1000);
-		}
-
-		selenium.clickAt("link=Message Boards Test Page",
-			RuntimeVariables.replace("Message Boards Test Page"));
-		selenium.waitForPageToLoad("30000");
-		loadRequiredJavaScriptModules();
-		assertEquals(RuntimeVariables.replace("MB Category Name"),
-			selenium.getText("//a/strong"));
-		selenium.clickAt("//a/strong",
-			RuntimeVariables.replace("MB Category Name"));
-		selenium.waitForPageToLoad("30000");
-		loadRequiredJavaScriptModules();
-		assertEquals(RuntimeVariables.replace("MB Category Name"),
-			selenium.getText("//h1[@class='header-title']/span"));
-		selenium.clickAt("//input[@value='Post New Thread']",
-			RuntimeVariables.replace("Post New Thread"));
-		selenium.waitForPageToLoad("30000");
-		loadRequiredJavaScriptModules();
-		selenium.type("//input[@id='_19_subject']",
-			RuntimeVariables.replace("MB Category Thread Message Subject"));
-
-		for (int second = 0;; second++) {
-			if (second >= 90) {
-				fail("timeout");
-			}
-
-			try {
-				if (selenium.isElementPresent(
-							"//textarea[@id='_19_editor' and @style='display: none;']")) {
-					break;
-				}
-			}
-			catch (Exception e) {
-			}
-
-			Thread.sleep(1000);
-		}
-
-		assertEquals(RuntimeVariables.replace("Source"),
-			selenium.getText("//span[.='Source']"));
-		selenium.clickAt("//span[.='Source']",
-			RuntimeVariables.replace("Source"));
-
-		for (int second = 0;; second++) {
-			if (second >= 90) {
-				fail("timeout");
-			}
-
-			try {
-				if (selenium.isVisible("//a[@class='cke_button_source cke_on']")) {
-					break;
-				}
-			}
-			catch (Exception e) {
-			}
-
-			Thread.sleep(1000);
-		}
-
-		for (int second = 0;; second++) {
-			if (second >= 90) {
-				fail("timeout");
-			}
-
-			try {
-				if (selenium.isVisible(
-							"//td[@id='cke_contents__19_editor']/textarea")) {
-					break;
-				}
-			}
-			catch (Exception e) {
-			}
-
-			Thread.sleep(1000);
-		}
-
-		selenium.type("//td[@id='cke_contents__19_editor']/textarea",
-			RuntimeVariables.replace("MB Category Thread Message Body"));
-		assertEquals(RuntimeVariables.replace("Source"),
-			selenium.getText("//span[.='Source']"));
-		selenium.clickAt("//span[.='Source']",
-			RuntimeVariables.replace("Source"));
-
-		for (int second = 0;; second++) {
-			if (second >= 90) {
-				fail("timeout");
-			}
-
-			try {
-				if (selenium.isElementPresent(
-							"//textarea[@id='_19_editor' and @style='display: none;']")) {
-					break;
-				}
-			}
-			catch (Exception e) {
-			}
-
-			Thread.sleep(1000);
-		}
-
-		for (int second = 0;; second++) {
-			if (second >= 90) {
-				fail("timeout");
-			}
-
-			try {
-				if (selenium.isVisible(
-							"//td[@id='cke_contents__19_editor']/iframe")) {
-					break;
-				}
-			}
-			catch (Exception e) {
-			}
-
-			Thread.sleep(1000);
-		}
-
-		selenium.selectFrame("//td[@id='cke_contents__19_editor']/iframe");
-
-		for (int second = 0;; second++) {
-			if (second >= 90) {
-				fail("timeout");
-			}
-
-			try {
-				if (RuntimeVariables.replace("MB Category Thread Message Body")
-										.equals(selenium.getText("//body"))) {
-					break;
-				}
-			}
-			catch (Exception e) {
-			}
-
-			Thread.sleep(1000);
-		}
-
-		selenium.selectFrame("relative=top");
-		assertFalse(selenium.isChecked("//input[@id='_19_questionCheckbox']"));
-		selenium.clickAt("//input[@id='_19_questionCheckbox']",
-			RuntimeVariables.replace("Mark as a Question"));
-		selenium.clickAt("//input[@value='Publish']",
-			RuntimeVariables.replace("Publish"));
-		selenium.waitForPageToLoad("30000");
-		loadRequiredJavaScriptModules();
-		assertEquals(RuntimeVariables.replace(
-				"Your request completed successfully."),
-			selenium.getText("//div[@class='portlet-msg-success']"));
-		assertEquals(RuntimeVariables.replace(
-				"MB Category Thread Message Subject"),
-			selenium.getText("//div[@class='subject']/a/strong"));
-		assertEquals(RuntimeVariables.replace("MB Category Thread Message Body"),
-			selenium.getText("//div[@class='thread-body']"));
-		selenium.open("/web/guest/home/");
-		loadRequiredJavaScriptModules();
-
-		for (int second = 0;; second++) {
-			if (second >= 90) {
-				fail("timeout");
-			}
-
-			try {
-				if (selenium.isVisible("link=Message Boards Test Page")) {
-					break;
-				}
-			}
-			catch (Exception e) {
-			}
-
-			Thread.sleep(1000);
-		}
-
-		selenium.clickAt("link=Message Boards Test Page",
-			RuntimeVariables.replace("Message Boards Test Page"));
-		selenium.waitForPageToLoad("30000");
-		loadRequiredJavaScriptModules();
-		assertEquals(RuntimeVariables.replace("MB Category Name"),
-			selenium.getText("//a/strong"));
-		selenium.clickAt("//a/strong",
-			RuntimeVariables.replace("MB Category Name"));
-		selenium.waitForPageToLoad("30000");
-		loadRequiredJavaScriptModules();
-		assertEquals(RuntimeVariables.replace(
-				"MB Category Thread Message Subject"),
-			selenium.getText("//td[1]/a"));
-		assertEquals(RuntimeVariables.replace("Waiting for an Answer"),
-			selenium.getText("//td[2]/a"));
-	}
-}
\ No newline at end of file
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/markasanswermbcategorymessagequestionreply/MarkAsAnswerMBCategoryMessageQuestionReplyTest.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/markasanswermbcategorymessagequestionreply/MarkAsAnswerMBCategoryMessageQuestionReplyTest.html
deleted file mode 100644
index 0971f8824c6d6d..00000000000000
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/markasanswermbcategorymessagequestionreply/MarkAsAnswerMBCategoryMessageQuestionReplyTest.html
+++ /dev/null
@@ -1,124 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>MarkAsAnswerMBCategoryMessageQuestionReplyTest</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-<thead>
-<tr><td rowspan="1" colspan="3">MarkAsAnswerMBCategoryMessageQuestionReplyTest</td></tr>
-</thead><tbody>
-<tr>
-	<td>open</td>
-	<td>/web/guest/home/</td>
-	<td></td>
-</tr>
-<tr>
-	<td>waitForVisible</td>
-	<td>link=Message Boards Test Page</td>
-	<td>Message Boards Test Page</td>
-</tr>
-<tr>
-	<td>clickAtAndWait</td>
-	<td>link=Message Boards Test Page</td>
-	<td>Message Boards Test Page</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//a/strong</td>
-	<td>MB Category Name</td>
-</tr>
-<tr>
-	<td>clickAtAndWait</td>
-	<td>//a/strong</td>
-	<td>MB Category Name</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//td[1]/a</td>
-	<td>MB Category Thread Message Subject</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//td[2]/a</td>
-	<td>Waiting for an Answer</td>
-</tr>
-<tr>
-	<td>clickAtAndWait</td>
-	<td>//td[1]/a</td>
-	<td>MB Category Thread Message Subject</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//div[5]/table/tbody/tr[1]/td[2]/div[1]/ul/li[1]/span/a/span</td>
-	<td>Mark as an Answer</td>
-</tr>
-<tr>
-	<td>clickAt</td>
-	<td>//div[5]/table/tbody/tr[1]/td[2]/div[1]/ul/li[1]/span/a/span</td>
-	<td>Mark as an Answer</td>
-</tr>
-<tr>
-	<td>waitForNotVisible</td>
-	<td>//div[5]/table/tbody/tr[1]/td[2]/div[1]/ul/li[1]/span/a/span</td>
-	<td>Mark as an Answer</td>
-</tr>
-<tr>
-	<td>assertNotVisible</td>
-	<td>//div[5]/table/tbody/tr[1]/td[2]/div[1]/ul/li[1]/span/a/span</td>
-	<td>Mark as an Answer</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//div[5]/table/tbody/tr[1]/td[2]/div[1]/div/div[2]/span/span</td>
-	<td>Answer</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//div[5]/table/tbody/tr[1]/td[2]/div[1]/div/div[2]/a</td>
-	<td>Unmark</td>
-</tr>
-<tr>
-	<td>open</td>
-	<td>/web/guest/home/</td>
-	<td></td>
-</tr>
-<tr>
-	<td>waitForVisible</td>
-	<td>link=Message Boards Test Page</td>
-	<td>Message Boards Test Page</td>
-</tr>
-<tr>
-	<td>clickAtAndWait</td>
-	<td>link=Message Boards Test Page</td>
-	<td>Message Boards Test Page</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//a/strong</td>
-	<td>MB Category Name</td>
-</tr>
-<tr>
-	<td>clickAtAndWait</td>
-	<td>//a/strong</td>
-	<td>MB Category Name</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//td[1]/a</td>
-	<td>MB Category Thread Message Subject</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//td[2]/a</td>
-	<td>Resolved</td>
-</tr>
-<tr>
-	<td>assertNotText</td>
-	<td>//td[2]/a</td>
-	<td>Waiting for an Answer</td>
-</tr>
-
-</tbody></table>
-</body>
-</html>
\ No newline at end of file
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/markasanswermbcategorymessagequestionreply/MarkAsAnswerMBCategoryMessageQuestionReplyTest.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/markasanswermbcategorymessagequestionreply/MarkAsAnswerMBCategoryMessageQuestionReplyTest.java
deleted file mode 100644
index c1b2fd00b83611..00000000000000
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/markasanswermbcategorymessagequestionreply/MarkAsAnswerMBCategoryMessageQuestionReplyTest.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/**
- * Copyright (c) 2000-2012 Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- */
-
-package com.liferay.portalweb.portlet.messageboards.mbmessage.markasanswermbcategorymessagequestionreply;
-
-import com.liferay.portalweb.portal.BaseTestCase;
-import com.liferay.portalweb.portal.util.RuntimeVariables;
-
-/**
- * @author Brian Wing Shun Chan
- */
-public class MarkAsAnswerMBCategoryMessageQuestionReplyTest extends BaseTestCase {
-	public void testMarkAsAnswerMBCategoryMessageQuestionReply()
-		throws Exception {
-		selenium.open("/web/guest/home/");
-		loadRequiredJavaScriptModules();
-
-		for (int second = 0;; second++) {
-			if (second >= 90) {
-				fail("timeout");
-			}
-
-			try {
-				if (selenium.isVisible("link=Message Boards Test Page")) {
-					break;
-				}
-			}
-			catch (Exception e) {
-			}
-
-			Thread.sleep(1000);
-		}
-
-		selenium.clickAt("link=Message Boards Test Page",
-			RuntimeVariables.replace("Message Boards Test Page"));
-		selenium.waitForPageToLoad("30000");
-		loadRequiredJavaScriptModules();
-		assertEquals(RuntimeVariables.replace("MB Category Name"),
-			selenium.getText("//a/strong"));
-		selenium.clickAt("//a/strong",
-			RuntimeVariables.replace("MB Category Name"));
-		selenium.waitForPageToLoad("30000");
-		loadRequiredJavaScriptModules();
-		assertEquals(RuntimeVariables.replace(
-				"MB Category Thread Message Subject"),
-			selenium.getText("//td[1]/a"));
-		assertEquals(RuntimeVariables.replace("Waiting for an Answer"),
-			selenium.getText("//td[2]/a"));
-		selenium.clickAt("//td[1]/a",
-			RuntimeVariables.replace("MB Category Thread Message Subject"));
-		selenium.waitForPageToLoad("30000");
-		loadRequiredJavaScriptModules();
-		assertEquals(RuntimeVariables.replace("Mark as an Answer"),
-			selenium.getText(
-				"//div[5]/table/tbody/tr[1]/td[2]/div[1]/ul/li[1]/span/a/span"));
-		selenium.clickAt("//div[5]/table/tbody/tr[1]/td[2]/div[1]/ul/li[1]/span/a/span",
-			RuntimeVariables.replace("Mark as an Answer"));
-
-		for (int second = 0;; second++) {
-			if (second >= 90) {
-				fail("timeout");
-			}
-
-			try {
-				if (!selenium.isVisible(
-							"//div[5]/table/tbody/tr[1]/td[2]/div[1]/ul/li[1]/span/a/span")) {
-					break;
-				}
-			}
-			catch (Exception e) {
-			}
-
-			Thread.sleep(1000);
-		}
-
-		assertFalse(selenium.isVisible(
-				"//div[5]/table/tbody/tr[1]/td[2]/div[1]/ul/li[1]/span/a/span"));
-		assertEquals(RuntimeVariables.replace("Answer"),
-			selenium.getText(
-				"//div[5]/table/tbody/tr[1]/td[2]/div[1]/div/div[2]/span/span"));
-		assertEquals(RuntimeVariables.replace("Unmark"),
-			selenium.getText(
-				"//div[5]/table/tbody/tr[1]/td[2]/div[1]/div/div[2]/a"));
-		selenium.open("/web/guest/home/");
-		loadRequiredJavaScriptModules();
-
-		for (int second = 0;; second++) {
-			if (second >= 90) {
-				fail("timeout");
-			}
-
-			try {
-				if (selenium.isVisible("link=Message Boards Test Page")) {
-					break;
-				}
-			}
-			catch (Exception e) {
-			}
-
-			Thread.sleep(1000);
-		}
-
-		selenium.clickAt("link=Message Boards Test Page",
-			RuntimeVariables.replace("Message Boards Test Page"));
-		selenium.waitForPageToLoad("30000");
-		loadRequiredJavaScriptModules();
-		assertEquals(RuntimeVariables.replace("MB Category Name"),
-			selenium.getText("//a/strong"));
-		selenium.clickAt("//a/strong",
-			RuntimeVariables.replace("MB Category Name"));
-		selenium.waitForPageToLoad("30000");
-		loadRequiredJavaScriptModules();
-		assertEquals(RuntimeVariables.replace(
-				"MB Category Thread Message Subject"),
-			selenium.getText("//td[1]/a"));
-		assertEquals(RuntimeVariables.replace("Resolved"),
-			selenium.getText("//td[2]/a"));
-		assertNotEquals(RuntimeVariables.replace("Waiting for an Answer"),
-			selenium.getText("//td[2]/a"));
-	}
-}
\ No newline at end of file
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/markasanswermbcategorymessagequestionreply/MarkAsAnswerMBCategoryMessageQuestionReplyTests.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/markasanswermbcategorymessagequestionreply/MarkAsAnswerMBCategoryMessageQuestionReplyTests.html
deleted file mode 100644
index 54b25d2ac93648..00000000000000
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/markasanswermbcategorymessagequestionreply/MarkAsAnswerMBCategoryMessageQuestionReplyTests.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <meta content="text/html; charset=UTF-8" http-equiv="content-type" />
-  <title>MarkAsAnswerMBCategoryMessageQuestionReplyTests</title>
-</head>
-<body>
-<table id="suiteTable" cellpadding="1" cellspacing="1" border="1" class="selenium"><tbody>
-<tr><td><b>MarkAsAnswerMBCategoryMessageQuestionReplyTests</b></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPageMBTest.html">AddPageMBTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPortletMBTest.html">AddPortletMBTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/AddMBCategoryTest.html">AddMBCategoryTest</a></td></tr>
-<tr><td><a href="AddMBCategoryMessageQuestionTest.html">AddMBCategoryMessageQuestionTest</a></td></tr>
-<tr><td><a href="AddMBCategoryMessageQuestionReplyTest.html">AddMBCategoryMessageQuestionReplyTest</a></td></tr>
-<tr><td><a href="MarkAsAnswerMBCategoryMessageQuestionReplyTest.html">MarkAsAnswerMBCategoryMessageQuestionReplyTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/TearDownMBCategoryTest.html">TearDownMBCategoryTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portal/util/TearDownPageTest.html">TearDownPageTest</a></td></tr>
-</tbody></table>
-</body>
-</html>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbthreadmessage/TearDownMBThreadMessageTest.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbthreadmessage/TearDownMBThreadMessageTest.html
deleted file mode 100644
index 14cb3034361aeb..00000000000000
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbthreadmessage/TearDownMBThreadMessageTest.html
+++ /dev/null
@@ -1,253 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>TearDownMBThreadMessageTest</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-<thead>
-<tr><td rowspan="1" colspan="3">TearDownMBThreadMessageTest</td></tr>
-</thead><tbody>
-<tr>
-	<td>open</td>
-	<td>/web/guest/home/</td>
-	<td></td>
-</tr>
-<tr>
-	<td>waitForVisible</td>
-	<td>link=Message Boards Test Page</td>
-	<td>Message Boards Test Page</td>
-</tr>
-<tr>
-	<td>clickAtAndWait</td>
-	<td>link=Message Boards Test Page</td>
-	<td>Message Boards Test Page</td>
-</tr>
-<tr>
-	<td>store</td>
-	<td>eval(selenium.isElementPresent('//td[7]/span/ul/li/strong/a'))</td>
-	<td>mbMessage1Present</td>
-</tr>
-<tr>
-	<td>gotoIf</td>
-	<td>!${mbMessage1Present}</td>
-	<td>MBMessage1NotPresent</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//td[7]/span/ul/li/strong/a</td>
-	<td>Actions</td>
-</tr>
-<tr>
-	<td>clickAt</td>
-	<td>//td[7]/span/ul/li/strong/a</td>
-	<td>Actions</td>
-</tr>
-<tr>
-	<td>waitForVisible</td>
-	<td>//div[@class='lfr-component lfr-menu-list']/ul/li[7]/a</td>
-	<td>Delete</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//div[@class='lfr-component lfr-menu-list']/ul/li[7]/a</td>
-	<td>Delete</td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>//div[@class='lfr-component lfr-menu-list']/ul/li[7]/a</td>
-	<td>Delete</td>
-</tr>
-<tr>
-	<td>assertConfirmation</td>
-	<td>Are you sure you want to delete this? It will be deleted immediately.</td>
-	<td></td>
-</tr>
-<tr>
-	<td>label</td>
-	<td>MBMessage1NotPresent</td>
-	<td></td>
-</tr>
-<tr>
-	<td>store</td>
-	<td>eval(selenium.isElementPresent('//td[7]/span/ul/li/strong/a'))</td>
-	<td>mbMessage2Present</td>
-</tr>
-<tr>
-	<td>gotoIf</td>
-	<td>!${mbMessage2Present}</td>
-	<td>MBMessage2NotPresent</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//td[7]/span/ul/li/strong/a</td>
-	<td>Actions</td>
-</tr>
-<tr>
-	<td>clickAt</td>
-	<td>//td[7]/span/ul/li/strong/a</td>
-	<td>Actions</td>
-</tr>
-<tr>
-	<td>waitForVisible</td>
-	<td>//div[@class='lfr-component lfr-menu-list']/ul/li[7]/a</td>
-	<td>Delete</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//div[@class='lfr-component lfr-menu-list']/ul/li[7]/a</td>
-	<td>Delete</td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>//div[@class='lfr-component lfr-menu-list']/ul/li[7]/a</td>
-	<td>Delete</td>
-</tr>
-<tr>
-	<td>assertConfirmation</td>
-	<td>Are you sure you want to delete this? It will be deleted immediately.</td>
-	<td></td>
-</tr>
-<tr>
-	<td>label</td>
-	<td>MBMessage2NotPresent</td>
-	<td></td>
-</tr>
-<tr>
-	<td>store</td>
-	<td>eval(selenium.isElementPresent('//td[7]/span/ul/li/strong/a'))</td>
-	<td>mbMessage3Present</td>
-</tr>
-<tr>
-	<td>gotoIf</td>
-	<td>!${mbMessage3Present}</td>
-	<td>MBMessage3NotPresent</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//td[7]/span/ul/li/strong/a</td>
-	<td>Actions</td>
-</tr>
-<tr>
-	<td>clickAt</td>
-	<td>//td[7]/span/ul/li/strong/a</td>
-	<td>Actions</td>
-</tr>
-<tr>
-	<td>waitForVisible</td>
-	<td>//div[@class='lfr-component lfr-menu-list']/ul/li[7]/a</td>
-	<td>Delete</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//div[@class='lfr-component lfr-menu-list']/ul/li[7]/a</td>
-	<td>Delete</td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>//div[@class='lfr-component lfr-menu-list']/ul/li[7]/a</td>
-	<td>Delete</td>
-</tr>
-<tr>
-	<td>assertConfirmation</td>
-	<td>Are you sure you want to delete this? It will be deleted immediately.</td>
-	<td></td>
-</tr>
-<tr>
-	<td>label</td>
-	<td>MBMessage3NotPresent</td>
-	<td></td>
-</tr>
-<tr>
-	<td>store</td>
-	<td>eval(selenium.isElementPresent('//td[7]/span/ul/li/strong/a'))</td>
-	<td>mbMessage4Present</td>
-</tr>
-<tr>
-	<td>gotoIf</td>
-	<td>!${mbMessage4Present}</td>
-	<td>MBMessage4NotPresent</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//td[7]/span/ul/li/strong/a</td>
-	<td>Actions</td>
-</tr>
-<tr>
-	<td>clickAt</td>
-	<td>//td[7]/span/ul/li/strong/a</td>
-	<td>Actions</td>
-</tr>
-<tr>
-	<td>waitForVisible</td>
-	<td>//div[@class='lfr-component lfr-menu-list']/ul/li[7]/a</td>
-	<td>Delete</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//div[@class='lfr-component lfr-menu-list']/ul/li[7]/a</td>
-	<td>Delete</td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>//div[@class='lfr-component lfr-menu-list']/ul/li[7]/a</td>
-	<td>Delete</td>
-</tr>
-<tr>
-	<td>assertConfirmation</td>
-	<td>Are you sure you want to delete this? It will be deleted immediately.</td>
-	<td></td>
-</tr>
-<tr>
-	<td>label</td>
-	<td>MBMessage4NotPresent</td>
-	<td></td>
-</tr>
-<tr>
-	<td>store</td>
-	<td>eval(selenium.isElementPresent('//td[7]/span/ul/li/strong/a'))</td>
-	<td>mbMessage5Present</td>
-</tr>
-<tr>
-	<td>gotoIf</td>
-	<td>!${mbMessage5Present}</td>
-	<td>MBMessage5NotPresent</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//td[7]/span/ul/li/strong/a</td>
-	<td>Actions</td>
-</tr>
-<tr>
-	<td>clickAt</td>
-	<td>//td[7]/span/ul/li/strong/a</td>
-	<td>Actions</td>
-</tr>
-<tr>
-	<td>waitForVisible</td>
-	<td>//div[@class='lfr-component lfr-menu-list']/ul/li[7]/a</td>
-	<td>Delete</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//div[@class='lfr-component lfr-menu-list']/ul/li[7]/a</td>
-	<td>Delete</td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>//div[@class='lfr-component lfr-menu-list']/ul/li[7]/a</td>
-	<td>Delete</td>
-</tr>
-<tr>
-	<td>assertConfirmation</td>
-	<td>Are you sure you want to delete this? It will be deleted immediately.</td>
-	<td></td>
-</tr>
-<tr>
-	<td>label</td>
-	<td>MBMessage5NotPresent</td>
-	<td></td>
-</tr>
-</tbody></table>
-</body>
-</html>
\ No newline at end of file
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbthreadmessage/TearDownMBThreadMessageTest.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbthreadmessage/TearDownMBThreadMessageTest.java
deleted file mode 100644
index 20354071d135ef..00000000000000
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbthreadmessage/TearDownMBThreadMessageTest.java
+++ /dev/null
@@ -1,273 +0,0 @@
-/**
- * Copyright (c) 2000-2012 Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- */
-
-package com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbthreadmessage;
-
-import com.liferay.portalweb.portal.BaseTestCase;
-import com.liferay.portalweb.portal.util.RuntimeVariables;
-
-/**
- * @author Brian Wing Shun Chan
- */
-public class TearDownMBThreadMessageTest extends BaseTestCase {
-	public void testTearDownMBThreadMessage() throws Exception {
-		int label = 1;
-
-		while (label >= 1) {
-			switch (label) {
-			case 1:
-				selenium.open("/web/guest/home/");
-				loadRequiredJavaScriptModules();
-
-				for (int second = 0;; second++) {
-					if (second >= 90) {
-						fail("timeout");
-					}
-
-					try {
-						if (selenium.isVisible("link=Message Boards Test Page")) {
-							break;
-						}
-					}
-					catch (Exception e) {
-					}
-
-					Thread.sleep(1000);
-				}
-
-				selenium.clickAt("link=Message Boards Test Page",
-					RuntimeVariables.replace("Message Boards Test Page"));
-				selenium.waitForPageToLoad("30000");
-				loadRequiredJavaScriptModules();
-
-				boolean mbMessage1Present = selenium.isElementPresent(
-						"//td[7]/span/ul/li/strong/a");
-
-				if (!mbMessage1Present) {
-					label = 2;
-
-					continue;
-				}
-
-				assertEquals(RuntimeVariables.replace("Actions"),
-					selenium.getText("//td[7]/span/ul/li/strong/a"));
-				selenium.clickAt("//td[7]/span/ul/li/strong/a",
-					RuntimeVariables.replace("Actions"));
-
-				for (int second = 0;; second++) {
-					if (second >= 90) {
-						fail("timeout");
-					}
-
-					try {
-						if (selenium.isVisible(
-									"//div[@class='lfr-component lfr-menu-list']/ul/li[7]/a")) {
-							break;
-						}
-					}
-					catch (Exception e) {
-					}
-
-					Thread.sleep(1000);
-				}
-
-				assertEquals(RuntimeVariables.replace("Delete"),
-					selenium.getText(
-						"//div[@class='lfr-component lfr-menu-list']/ul/li[7]/a"));
-				selenium.click(RuntimeVariables.replace(
-						"//div[@class='lfr-component lfr-menu-list']/ul/li[7]/a"));
-				selenium.waitForPageToLoad("30000");
-				loadRequiredJavaScriptModules();
-				assertTrue(selenium.getConfirmation()
-								   .matches("^Are you sure you want to delete this[\\s\\S] It will be deleted immediately.$"));
-
-			case 2:
-
-				boolean mbMessage2Present = selenium.isElementPresent(
-						"//td[7]/span/ul/li/strong/a");
-
-				if (!mbMessage2Present) {
-					label = 3;
-
-					continue;
-				}
-
-				assertEquals(RuntimeVariables.replace("Actions"),
-					selenium.getText("//td[7]/span/ul/li/strong/a"));
-				selenium.clickAt("//td[7]/span/ul/li/strong/a",
-					RuntimeVariables.replace("Actions"));
-
-				for (int second = 0;; second++) {
-					if (second >= 90) {
-						fail("timeout");
-					}
-
-					try {
-						if (selenium.isVisible(
-									"//div[@class='lfr-component lfr-menu-list']/ul/li[7]/a")) {
-							break;
-						}
-					}
-					catch (Exception e) {
-					}
-
-					Thread.sleep(1000);
-				}
-
-				assertEquals(RuntimeVariables.replace("Delete"),
-					selenium.getText(
-						"//div[@class='lfr-component lfr-menu-list']/ul/li[7]/a"));
-				selenium.click(RuntimeVariables.replace(
-						"//div[@class='lfr-component lfr-menu-list']/ul/li[7]/a"));
-				selenium.waitForPageToLoad("30000");
-				loadRequiredJavaScriptModules();
-				assertTrue(selenium.getConfirmation()
-								   .matches("^Are you sure you want to delete this[\\s\\S] It will be deleted immediately.$"));
-
-			case 3:
-
-				boolean mbMessage3Present = selenium.isElementPresent(
-						"//td[7]/span/ul/li/strong/a");
-
-				if (!mbMessage3Present) {
-					label = 4;
-
-					continue;
-				}
-
-				assertEquals(RuntimeVariables.replace("Actions"),
-					selenium.getText("//td[7]/span/ul/li/strong/a"));
-				selenium.clickAt("//td[7]/span/ul/li/strong/a",
-					RuntimeVariables.replace("Actions"));
-
-				for (int second = 0;; second++) {
-					if (second >= 90) {
-						fail("timeout");
-					}
-
-					try {
-						if (selenium.isVisible(
-									"//div[@class='lfr-component lfr-menu-list']/ul/li[7]/a")) {
-							break;
-						}
-					}
-					catch (Exception e) {
-					}
-
-					Thread.sleep(1000);
-				}
-
-				assertEquals(RuntimeVariables.replace("Delete"),
-					selenium.getText(
-						"//div[@class='lfr-component lfr-menu-list']/ul/li[7]/a"));
-				selenium.click(RuntimeVariables.replace(
-						"//div[@class='lfr-component lfr-menu-list']/ul/li[7]/a"));
-				selenium.waitForPageToLoad("30000");
-				loadRequiredJavaScriptModules();
-				assertTrue(selenium.getConfirmation()
-								   .matches("^Are you sure you want to delete this[\\s\\S] It will be deleted immediately.$"));
-
-			case 4:
-
-				boolean mbMessage4Present = selenium.isElementPresent(
-						"//td[7]/span/ul/li/strong/a");
-
-				if (!mbMessage4Present) {
-					label = 5;
-
-					continue;
-				}
-
-				assertEquals(RuntimeVariables.replace("Actions"),
-					selenium.getText("//td[7]/span/ul/li/strong/a"));
-				selenium.clickAt("//td[7]/span/ul/li/strong/a",
-					RuntimeVariables.replace("Actions"));
-
-				for (int second = 0;; second++) {
-					if (second >= 90) {
-						fail("timeout");
-					}
-
-					try {
-						if (selenium.isVisible(
-									"//div[@class='lfr-component lfr-menu-list']/ul/li[7]/a")) {
-							break;
-						}
-					}
-					catch (Exception e) {
-					}
-
-					Thread.sleep(1000);
-				}
-
-				assertEquals(RuntimeVariables.replace("Delete"),
-					selenium.getText(
-						"//div[@class='lfr-component lfr-menu-list']/ul/li[7]/a"));
-				selenium.click(RuntimeVariables.replace(
-						"//div[@class='lfr-component lfr-menu-list']/ul/li[7]/a"));
-				selenium.waitForPageToLoad("30000");
-				loadRequiredJavaScriptModules();
-				assertTrue(selenium.getConfirmation()
-								   .matches("^Are you sure you want to delete this[\\s\\S] It will be deleted immediately.$"));
-
-			case 5:
-
-				boolean mbMessage5Present = selenium.isElementPresent(
-						"//td[7]/span/ul/li/strong/a");
-
-				if (!mbMessage5Present) {
-					label = 6;
-
-					continue;
-				}
-
-				assertEquals(RuntimeVariables.replace("Actions"),
-					selenium.getText("//td[7]/span/ul/li/strong/a"));
-				selenium.clickAt("//td[7]/span/ul/li/strong/a",
-					RuntimeVariables.replace("Actions"));
-
-				for (int second = 0;; second++) {
-					if (second >= 90) {
-						fail("timeout");
-					}
-
-					try {
-						if (selenium.isVisible(
-									"//div[@class='lfr-component lfr-menu-list']/ul/li[7]/a")) {
-							break;
-						}
-					}
-					catch (Exception e) {
-					}
-
-					Thread.sleep(1000);
-				}
-
-				assertEquals(RuntimeVariables.replace("Delete"),
-					selenium.getText(
-						"//div[@class='lfr-component lfr-menu-list']/ul/li[7]/a"));
-				selenium.click(RuntimeVariables.replace(
-						"//div[@class='lfr-component lfr-menu-list']/ul/li[7]/a"));
-				selenium.waitForPageToLoad("30000");
-				loadRequiredJavaScriptModules();
-				assertTrue(selenium.getConfirmation()
-								   .matches("^Are you sure you want to delete this[\\s\\S] It will be deleted immediately.$"));
-
-			case 6:
-			case 100:
-				label = -1;
-			}
-		}
-	}
-}
\ No newline at end of file
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbthreadsmessage/PostNewMBThreadsMessageTests.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbthreadsmessage/PostNewMBThreadsMessageTests.html
deleted file mode 100644
index a113763ade55ee..00000000000000
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbthreadsmessage/PostNewMBThreadsMessageTests.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <meta content="text/html; charset=UTF-8" http-equiv="content-type" />
-  <title>Test Suite</title>
-</head>
-<body>
-<table id="suiteTable" cellpadding="1" cellspacing="1" border="1" class="selenium"><tbody>
-<tr><td><b>Test Suite</b></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPageMBTest.html">AddPageMBTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPortletMBTest.html">AddPortletMBTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/postnewmbthreadmessage/PostNewMBThread1MessageTest.html">PostNewMBThread1MessageTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/postnewmbthreadmessage/PostNewMBThread2MessageTest.html">PostNewMBThread2MessageTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/postnewmbthreadmessage/PostNewMBThread3MessageTest.html">PostNewMBThread3MessageTest</a></td></tr>
-<tr><td><a href="ViewMBThread1MessageTest.html">ViewMBThread1MessageTest</a></td></tr>
-<tr><td><a href="ViewMBThread2MessageTest.html">ViewMBThread2MessageTest</a></td></tr>
-<tr><td><a href="ViewMBThread3MessageTest.html">ViewMBThread3MessageTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/postnewmbthreadmessage/TearDownMBThreadTest.html">TearDownMBThreadTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portal/util/TearDownPageTest.html">TearDownPageTest</a></td></tr>
-</tbody></table>
-</body>
-</html>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/previewmbthreadmessagedetails/PreviewMBThreadMessageDetailsTests.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/previewmbthreadmessagedetails/PreviewMBThreadMessageDetailsTests.html
deleted file mode 100644
index 7099f2a6dfd5ed..00000000000000
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/previewmbthreadmessagedetails/PreviewMBThreadMessageDetailsTests.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <meta content="text/html; charset=UTF-8" http-equiv="content-type" />
-  <title>PreviewMBThreadMessageDetailsTests</title>
-</head>
-<body>
-<table id="suiteTable" cellpadding="1" cellspacing="1" border="1" class="selenium"><tbody>
-<tr><td><b>PreviewMBThreadMessageDetailsTests</b></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPageMBTest.html">AddPageMBTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPortletMBTest.html">AddPortletMBTest</a></td></tr>
-<tr><td><a href="PreviewMBThreadMessageDetailsTest.html">PreviewMBThreadMessageDetailsTest</a></td></tr>
-<tr><td><a href="TearDownMBThreadMessageTest.html">TearDownMBThreadMessageTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portal/util/TearDownPageTest.html">TearDownPageTest</a></td></tr>
-</tbody></table>
-</body>
-</html>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/previewmbthreadmessagedetails/PreviewMBThreadMessageDetailsTests.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/previewmbthreadmessagedetails/PreviewMBThreadMessageDetailsTests.java
deleted file mode 100644
index 1acbdfd151e430..00000000000000
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/previewmbthreadmessagedetails/PreviewMBThreadMessageDetailsTests.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * Copyright (c) 2000-2012 Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- */
-
-package com.liferay.portalweb.portlet.messageboards.mbmessage.previewmbthreadmessagedetails;
-
-import com.liferay.portalweb.portal.BaseTestSuite;
-import com.liferay.portalweb.portal.util.TearDownPageTest;
-import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPageMBTest;
-import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPortletMBTest;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-/**
- * @author Brian Wing Shun Chan
- */
-public class PreviewMBThreadMessageDetailsTests extends BaseTestSuite {
-	public static Test suite() {
-		TestSuite testSuite = new TestSuite();
-		testSuite.addTestSuite(AddPageMBTest.class);
-		testSuite.addTestSuite(AddPortletMBTest.class);
-		testSuite.addTestSuite(PreviewMBThreadMessageDetailsTest.class);
-		testSuite.addTestSuite(TearDownMBThreadMessageTest.class);
-		testSuite.addTestSuite(TearDownPageTest.class);
-
-		return testSuite;
-	}
-}
\ No newline at end of file
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/previousmbcategorymessage/PreviousMBCategoryMessageTests.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/previousmbcategorymessage/PreviousMBCategoryMessageTests.java
deleted file mode 100644
index 363ab492f8abd1..00000000000000
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/previousmbcategorymessage/PreviousMBCategoryMessageTests.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/**
- * Copyright (c) 2000-2012 Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- */
-
-package com.liferay.portalweb.portlet.messageboards.mbmessage.previousmbcategorymessage;
-
-import com.liferay.portalweb.portal.BaseTestSuite;
-import com.liferay.portalweb.portal.util.TearDownPageTest;
-import com.liferay.portalweb.portlet.messageboards.mbcategory.addmbcategory.AddMBCategoryTest;
-import com.liferay.portalweb.portlet.messageboards.mbcategory.addmbcategory.TearDownMBCategoryTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbcategorythreadmessage.PostNewMBCategoryThread1MessageTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbcategorythreadmessage.PostNewMBCategoryThread2MessageTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbcategorythreadmessage.PostNewMBCategoryThread3MessageTest;
-import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPageMBTest;
-import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPortletMBTest;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-/**
- * @author Brian Wing Shun Chan
- */
-public class PreviousMBCategoryMessageTests extends BaseTestSuite {
-	public static Test suite() {
-		TestSuite testSuite = new TestSuite();
-		testSuite.addTestSuite(AddPageMBTest.class);
-		testSuite.addTestSuite(AddPortletMBTest.class);
-		testSuite.addTestSuite(AddMBCategoryTest.class);
-		testSuite.addTestSuite(PostNewMBCategoryThread1MessageTest.class);
-		testSuite.addTestSuite(PostNewMBCategoryThread2MessageTest.class);
-		testSuite.addTestSuite(PostNewMBCategoryThread3MessageTest.class);
-		testSuite.addTestSuite(PreviousMBCategoryMessageTest.class);
-		testSuite.addTestSuite(TearDownMBCategoryTest.class);
-		testSuite.addTestSuite(TearDownPageTest.class);
-
-		return testSuite;
-	}
-}
\ No newline at end of file
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/ratembcategorymessage/RateMBCategoryMessageTests.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/ratembcategorymessage/RateMBCategoryMessageTests.java
deleted file mode 100644
index 0b9c2ac5cbe8da..00000000000000
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/ratembcategorymessage/RateMBCategoryMessageTests.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * Copyright (c) 2000-2012 Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- */
-
-package com.liferay.portalweb.portlet.messageboards.mbmessage.ratembcategorymessage;
-
-import com.liferay.portalweb.portal.BaseTestSuite;
-import com.liferay.portalweb.portal.util.TearDownPageTest;
-import com.liferay.portalweb.portlet.messageboards.mbcategory.addmbcategory.AddMBCategoryTest;
-import com.liferay.portalweb.portlet.messageboards.mbcategory.addmbcategory.TearDownMBCategoryTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbcategorythreadmessage.PostNewMBCategoryThreadMessageTest;
-import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPageMBTest;
-import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPortletMBTest;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-/**
- * @author Brian Wing Shun Chan
- */
-public class RateMBCategoryMessageTests extends BaseTestSuite {
-	public static Test suite() {
-		TestSuite testSuite = new TestSuite();
-		testSuite.addTestSuite(AddPageMBTest.class);
-		testSuite.addTestSuite(AddPortletMBTest.class);
-		testSuite.addTestSuite(AddMBCategoryTest.class);
-		testSuite.addTestSuite(PostNewMBCategoryThreadMessageTest.class);
-		testSuite.addTestSuite(RateMBCategoryMessageTest.class);
-		testSuite.addTestSuite(TearDownMBCategoryTest.class);
-		testSuite.addTestSuite(TearDownPageTest.class);
-
-		return testSuite;
-	}
-}
\ No newline at end of file
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbcategorythreadmessagereplies/ReplyMBCategoryThreadMessageRepliesTests.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbcategorythreadmessagereplies/ReplyMBCategoryThreadMessageRepliesTests.java
deleted file mode 100644
index 551655f3b2c75d..00000000000000
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbcategorythreadmessagereplies/ReplyMBCategoryThreadMessageRepliesTests.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/**
- * Copyright (c) 2000-2012 Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- */
-
-package com.liferay.portalweb.portlet.messageboards.mbmessage.replymbcategorythreadmessagereplies;
-
-import com.liferay.portalweb.portal.BaseTestSuite;
-import com.liferay.portalweb.portal.util.TearDownPageTest;
-import com.liferay.portalweb.portlet.messageboards.mbcategory.addmbcategory.AddMBCategoryTest;
-import com.liferay.portalweb.portlet.messageboards.mbcategory.addmbcategory.TearDownMBCategoryTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbcategorythreadmessage.PostNewMBCategoryThreadMessageTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbthreadmessage.TearDownMBThreadTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.replymbcategorythreadmessagereply.ReplyMBCategoryThreadMessageReply1Test;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.replymbcategorythreadmessagereply.ReplyMBCategoryThreadMessageReply2Test;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.replymbcategorythreadmessagereply.ReplyMBCategoryThreadMessageReply3Test;
-import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPageMBTest;
-import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPortletMBTest;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-/**
- * @author Brian Wing Shun Chan
- */
-public class ReplyMBCategoryThreadMessageRepliesTests extends BaseTestSuite {
-	public static Test suite() {
-		TestSuite testSuite = new TestSuite();
-		testSuite.addTestSuite(AddPageMBTest.class);
-		testSuite.addTestSuite(AddPortletMBTest.class);
-		testSuite.addTestSuite(AddMBCategoryTest.class);
-		testSuite.addTestSuite(PostNewMBCategoryThreadMessageTest.class);
-		testSuite.addTestSuite(ReplyMBCategoryThreadMessageReply1Test.class);
-		testSuite.addTestSuite(ViewMBCategoryThreadMessageReply1Test.class);
-		testSuite.addTestSuite(ReplyMBCategoryThreadMessageReply2Test.class);
-		testSuite.addTestSuite(ViewMBCategoryThreadMessageReply2Test.class);
-		testSuite.addTestSuite(ReplyMBCategoryThreadMessageReply3Test.class);
-		testSuite.addTestSuite(ViewMBCategoryThreadMessageReply3Test.class);
-		testSuite.addTestSuite(TearDownMBCategoryTest.class);
-		testSuite.addTestSuite(TearDownMBThreadTest.class);
-		testSuite.addTestSuite(TearDownPageTest.class);
-
-		return testSuite;
-	}
-}
\ No newline at end of file
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbthreadmessagereplies/ReplyMBThreadMessageRepliesTests.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbthreadmessagereplies/ReplyMBThreadMessageRepliesTests.html
deleted file mode 100644
index d3e713a244a6a2..00000000000000
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbthreadmessagereplies/ReplyMBThreadMessageRepliesTests.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <meta content="text/html; charset=UTF-8" http-equiv="content-type" />
-  <title>Test Suite</title>
-</head>
-<body>
-<table id="suiteTable" cellpadding="1" cellspacing="1" border="1" class="selenium"><tbody>
-<tr><td><b>Test Suite</b></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPageMBTest.html">AddPageMBTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPortletMBTest.html">AddPortletMBTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/postnewmbthreadmessage/PostNewMBThreadMessageTest.html">PostNewMBThreadMessageTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/replymbthreadmessagereply/ReplyMBThreadMessageReply1Test.html">ReplyMBThreadMessageReply1Test</a></td></tr>
-<tr><td><a href="ViewMBThreadMessageReply1Test.html">ViewMBThreadMessageReply1Test</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/replymbthreadmessagereply/ReplyMBThreadMessageReply2Test.html">ReplyMBThreadMessageReply2Test</a></td></tr>
-<tr><td><a href="ViewMBThreadMessageReply2Test.html">ViewMBThreadMessageReply2Test</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/replymbthreadmessagereply/ReplyMBThreadMessageReply3Test.html">ReplyMBThreadMessageReply3Test</a></td></tr>
-<tr><td><a href="ViewMBThreadMessageReply3Test.html">ViewMBThreadMessageReply3Test</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/postnewmbthreadmessage/TearDownMBThreadTest.html">TearDownMBThreadTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portal/util/TearDownPageTest.html">TearDownPageTest</a></td></tr>
-</tbody></table>
-</body>
-</html>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbthreadmessagereplies/ReplyMBThreadMessageRepliesTests.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbthreadmessagereplies/ReplyMBThreadMessageRepliesTests.java
deleted file mode 100644
index 161a33253da049..00000000000000
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbthreadmessagereplies/ReplyMBThreadMessageRepliesTests.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- * Copyright (c) 2000-2012 Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- */
-
-package com.liferay.portalweb.portlet.messageboards.mbmessage.replymbthreadmessagereplies;
-
-import com.liferay.portalweb.portal.BaseTestSuite;
-import com.liferay.portalweb.portal.util.TearDownPageTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbthreadmessage.PostNewMBThreadMessageTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbthreadmessage.TearDownMBThreadTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.replymbthreadmessagereply.ReplyMBThreadMessageReply1Test;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.replymbthreadmessagereply.ReplyMBThreadMessageReply2Test;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.replymbthreadmessagereply.ReplyMBThreadMessageReply3Test;
-import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPageMBTest;
-import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPortletMBTest;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-/**
- * @author Brian Wing Shun Chan
- */
-public class ReplyMBThreadMessageRepliesTests extends BaseTestSuite {
-	public static Test suite() {
-		TestSuite testSuite = new TestSuite();
-		testSuite.addTestSuite(AddPageMBTest.class);
-		testSuite.addTestSuite(AddPortletMBTest.class);
-		testSuite.addTestSuite(PostNewMBThreadMessageTest.class);
-		testSuite.addTestSuite(ReplyMBThreadMessageReply1Test.class);
-		testSuite.addTestSuite(ViewMBThreadMessageReply1Test.class);
-		testSuite.addTestSuite(ReplyMBThreadMessageReply2Test.class);
-		testSuite.addTestSuite(ViewMBThreadMessageReply2Test.class);
-		testSuite.addTestSuite(ReplyMBThreadMessageReply3Test.class);
-		testSuite.addTestSuite(ViewMBThreadMessageReply3Test.class);
-		testSuite.addTestSuite(TearDownMBThreadTest.class);
-		testSuite.addTestSuite(TearDownPageTest.class);
-
-		return testSuite;
-	}
-}
\ No newline at end of file
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbthreadmessagereplymultiple/ReplyMBThreadMessageReplyMultipleTests.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbthreadmessagereplymultiple/ReplyMBThreadMessageReplyMultipleTests.html
deleted file mode 100644
index 11804ba8847b21..00000000000000
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbthreadmessagereplymultiple/ReplyMBThreadMessageReplyMultipleTests.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <meta content="text/html; charset=UTF-8" http-equiv="content-type" />
-  <title>Test Suite</title>
-</head>
-<body>
-<table id="suiteTable" cellpadding="1" cellspacing="1" border="1" class="selenium"><tbody>
-<tr><td><b>Test Suite</b></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPageMBTest.html">AddPageMBTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPortletMBTest.html">AddPortletMBTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/postnewmbthreadmessage/PostNewMBThreadMessageTest.html">PostNewMBThreadMessageTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/replymbthreadmessagereply/ReplyMBThreadMessageReply1Test.html">ReplyMBThreadMessageReply1Test</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/replymbthreadmessagereplies/ViewMBThreadMessageReply1Test.html">ViewMBThreadMessageReply1Test</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/replymbthreadmessagereply/ReplyMBThreadMessageReply2Test.html">ReplyMBThreadMessageReply2Test</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/replymbthreadmessagereplies/ViewMBThreadMessageReply2Test.html">ViewMBThreadMessageReply2Test</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/replymbthreadmessagereply/ReplyMBThreadMessageReply3Test.html">ReplyMBThreadMessageReply3Test</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/replymbthreadmessagereplies/ViewMBThreadMessageReply3Test.html">ViewMBThreadMessageReply3Test</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/postnewmbthreadmessage/TearDownMBThreadTest.html">TearDownMBThreadTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portal/util/TearDownPageTest.html">TearDownPageTest</a></td></tr>
-</tbody></table>
-</body>
-</html>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbthreadmessagereplymultiple/ReplyMBThreadMessageReplyMultipleTests.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbthreadmessagereplymultiple/ReplyMBThreadMessageReplyMultipleTests.java
deleted file mode 100644
index 8113917992845c..00000000000000
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbthreadmessagereplymultiple/ReplyMBThreadMessageReplyMultipleTests.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
- * Copyright (c) 2000-2012 Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- */
-
-package com.liferay.portalweb.portlet.messageboards.mbmessage.replymbthreadmessagereplymultiple;
-
-import com.liferay.portalweb.portal.BaseTestSuite;
-import com.liferay.portalweb.portal.util.TearDownPageTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbthreadmessage.PostNewMBThreadMessageTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbthreadmessage.TearDownMBThreadTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.replymbthreadmessagereplies.ViewMBThreadMessageReply1Test;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.replymbthreadmessagereplies.ViewMBThreadMessageReply2Test;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.replymbthreadmessagereplies.ViewMBThreadMessageReply3Test;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.replymbthreadmessagereply.ReplyMBThreadMessageReply1Test;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.replymbthreadmessagereply.ReplyMBThreadMessageReply2Test;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.replymbthreadmessagereply.ReplyMBThreadMessageReply3Test;
-import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPageMBTest;
-import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPortletMBTest;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-/**
- * @author Brian Wing Shun Chan
- */
-public class ReplyMBThreadMessageReplyMultipleTests extends BaseTestSuite {
-	public static Test suite() {
-		TestSuite testSuite = new TestSuite();
-		testSuite.addTestSuite(AddPageMBTest.class);
-		testSuite.addTestSuite(AddPortletMBTest.class);
-		testSuite.addTestSuite(PostNewMBThreadMessageTest.class);
-		testSuite.addTestSuite(ReplyMBThreadMessageReply1Test.class);
-		testSuite.addTestSuite(ViewMBThreadMessageReply1Test.class);
-		testSuite.addTestSuite(ReplyMBThreadMessageReply2Test.class);
-		testSuite.addTestSuite(ViewMBThreadMessageReply2Test.class);
-		testSuite.addTestSuite(ReplyMBThreadMessageReply3Test.class);
-		testSuite.addTestSuite(ViewMBThreadMessageReply3Test.class);
-		testSuite.addTestSuite(TearDownMBThreadTest.class);
-		testSuite.addTestSuite(TearDownPageTest.class);
-
-		return testSuite;
-	}
-}
\ No newline at end of file
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/searchmbcategorymessage/SearchMBCategoryMessageTests.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/searchmbcategorymessage/SearchMBCategoryMessageTests.html
deleted file mode 100644
index d04f998ae6b98d..00000000000000
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/searchmbcategorymessage/SearchMBCategoryMessageTests.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <meta content="text/html; charset=UTF-8" http-equiv="content-type" />
-  <title>SearchMBCategoryMessageTests</title>
-</head>
-<body>
-<table id="suiteTable" cellpadding="1" cellspacing="1" border="1" class="selenium"><tbody>
-<tr><td><b>SearchMBCategoryMessageTests</b></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPageMBTest.html">AddPageMBTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPortletMBTest.html">AddPortletMBTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/AddMBCategoryTest.html">AddMBCategoryTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThreadMessageTest.html">PostNewMBCategoryThreadMessageTest</a></td></tr>
-<tr><td><a href="SearchMBCategoryMessageTest.html">SearchMBCategoryMessageTest</a></td></tr>
-<tr><td><a href="SearchMBCategoryMessageQuotesTest.html">SearchMBCategoryMessageQuotesTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/TearDownMBCategoryTest.html">TearDownMBCategoryTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portal/util/TearDownPageTest.html">TearDownPageTest</a></td></tr>
-</tbody></table>
-</body>
-</html>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/searchmbcategorymessage/SearchMBCategoryMessageTests.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/searchmbcategorymessage/SearchMBCategoryMessageTests.java
deleted file mode 100644
index 635ad21461d02d..00000000000000
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/searchmbcategorymessage/SearchMBCategoryMessageTests.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- * Copyright (c) 2000-2012 Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- */
-
-package com.liferay.portalweb.portlet.messageboards.mbmessage.searchmbcategorymessage;
-
-import com.liferay.portalweb.portal.BaseTestSuite;
-import com.liferay.portalweb.portal.util.TearDownPageTest;
-import com.liferay.portalweb.portlet.messageboards.mbcategory.addmbcategory.AddMBCategoryTest;
-import com.liferay.portalweb.portlet.messageboards.mbcategory.addmbcategory.TearDownMBCategoryTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbcategorythreadmessage.PostNewMBCategoryThreadMessageTest;
-import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPageMBTest;
-import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPortletMBTest;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-/**
- * @author Brian Wing Shun Chan
- */
-public class SearchMBCategoryMessageTests extends BaseTestSuite {
-	public static Test suite() {
-		TestSuite testSuite = new TestSuite();
-		testSuite.addTestSuite(AddPageMBTest.class);
-		testSuite.addTestSuite(AddPortletMBTest.class);
-		testSuite.addTestSuite(AddMBCategoryTest.class);
-		testSuite.addTestSuite(PostNewMBCategoryThreadMessageTest.class);
-		testSuite.addTestSuite(SearchMBCategoryMessageTest.class);
-		testSuite.addTestSuite(SearchMBCategoryMessageQuotesTest.class);
-		testSuite.addTestSuite(TearDownMBCategoryTest.class);
-		testSuite.addTestSuite(TearDownPageTest.class);
-
-		return testSuite;
-	}
-}
\ No newline at end of file
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/splitthreadmbcategorymessagereplyreply/SplitThreadMBCategoryMessageReplyReplyTests.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/splitthreadmbcategorymessagereplyreply/SplitThreadMBCategoryMessageReplyReplyTests.java
deleted file mode 100644
index 20938294f8322b..00000000000000
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/splitthreadmbcategorymessagereplyreply/SplitThreadMBCategoryMessageReplyReplyTests.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
- * Copyright (c) 2000-2012 Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- */
-
-package com.liferay.portalweb.portlet.messageboards.mbmessage.splitthreadmbcategorymessagereplyreply;
-
-import com.liferay.portalweb.portal.BaseTestSuite;
-import com.liferay.portalweb.portal.util.TearDownPageTest;
-import com.liferay.portalweb.portlet.messageboards.mbcategory.addmbcategory.AddMBCategoryTest;
-import com.liferay.portalweb.portlet.messageboards.mbcategory.addmbcategory.TearDownMBCategoryTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbcategorythreadmessage.PostNewMBCategoryThreadMessageTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbthreadmessage.TearDownMBThreadTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.replymbcategorythreadmessagereply.ReplyMBCategoryThreadMessageReplyTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.replymbcategorythreadmessagereplyreply.ReplyMBCategoryThreadMessageReplyReplyTest;
-import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPageMBTest;
-import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPortletMBTest;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-/**
- * @author Brian Wing Shun Chan
- */
-public class SplitThreadMBCategoryMessageReplyReplyTests extends BaseTestSuite {
-	public static Test suite() {
-		TestSuite testSuite = new TestSuite();
-		testSuite.addTestSuite(AddPageMBTest.class);
-		testSuite.addTestSuite(AddPortletMBTest.class);
-		testSuite.addTestSuite(AddMBCategoryTest.class);
-		testSuite.addTestSuite(PostNewMBCategoryThreadMessageTest.class);
-		testSuite.addTestSuite(ReplyMBCategoryThreadMessageReplyTest.class);
-		testSuite.addTestSuite(ReplyMBCategoryThreadMessageReplyReplyTest.class);
-		testSuite.addTestSuite(SplitThreadMBCategoryMessageReplyReplyTest.class);
-		testSuite.addTestSuite(ViewSplitThreadMBCategoryMessageReplyReplyTest.class);
-		testSuite.addTestSuite(TearDownMBCategoryTest.class);
-		testSuite.addTestSuite(TearDownMBThreadTest.class);
-		testSuite.addTestSuite(TearDownPageTest.class);
-
-		return testSuite;
-	}
-}
\ No newline at end of file
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/unmarkmbcategorymessagequestionreply/AddMBCategoryMessageQuestionReplyTest.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/unmarkmbcategorymessagequestionreply/AddMBCategoryMessageQuestionReplyTest.html
deleted file mode 100644
index 4fabd30657b9d7..00000000000000
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/unmarkmbcategorymessagequestionreply/AddMBCategoryMessageQuestionReplyTest.html
+++ /dev/null
@@ -1,193 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>AddMBCategoryMessageQuestionReplyTest</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-<thead>
-<tr><td rowspan="1" colspan="3">AddMBCategoryMessageQuestionReplyTest</td></tr>
-</thead><tbody>
-<tr>
-	<td>open</td>
-	<td>/web/guest/home/</td>
-	<td></td>
-</tr>
-<tr>
-	<td>waitForVisible</td>
-	<td>link=Message Boards Test Page</td>
-	<td>Message Boards Test Page</td>
-</tr>
-<tr>
-	<td>clickAtAndWait</td>
-	<td>link=Message Boards Test Page</td>
-	<td>Message Boards Test Page</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//a/strong</td>
-	<td>MB Category Name</td>
-</tr>
-<tr>
-	<td>clickAtAndWait</td>
-	<td>//a/strong</td>
-	<td>MB Category Name</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//td[1]/a</td>
-	<td>MB Category Thread Message Subject</td>
-</tr>
-<tr>
-	<td>clickAtAndWait</td>
-	<td>//td[1]/a</td>
-	<td>MB Category Thread Message Subject</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//li[contains(.,'Reply')]/span/a/span</td>
-	<td>Reply</td>
-</tr>
-<tr>
-	<td>clickAtAndWait</td>
-	<td>//li[contains(.,'Reply')]/span/a/span</td>
-	<td>Reply</td>
-</tr>
-<tr>
-	<td>assertValue</td>
-	<td>//input[@id='_19_subject']</td>
-	<td>RE: MB Category Thread Message Subject</td>
-</tr>
-<tr>
-	<td>waitForElementPresent</td>
-	<td>//textarea[@id='_19_editor' and @style='display: none;']</td>
-	<td>Text Area</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//span[.='Source']</td>
-	<td>Source</td>
-</tr>
-<tr>
-	<td>clickAt</td>
-	<td>//span[.='Source']</td>
-	<td>Source</td>
-</tr>
-<tr>
-	<td>waitForVisible</td>
-	<td>//a[@class='cke_button_source cke_on']</td>
-	<td>Source Button On</td>
-</tr>
-<tr>
-	<td>waitForVisible</td>
-	<td>//td[@id='cke_contents__19_editor']/textarea</td>
-	<td>CK Editor</td>
-</tr>
-<tr>
-	<td>type</td>
-	<td>//td[@id='cke_contents__19_editor']/textarea</td>
-	<td>MB Category Thread Message Reply Body</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//span[.='Source']</td>
-	<td>Source</td>
-</tr>
-<tr>
-	<td>clickAt</td>
-	<td>//span[.='Source']</td>
-	<td>Source</td>
-</tr>
-<tr>
-	<td>waitForElementPresent</td>
-	<td>//textarea[@id='_19_editor' and @style='display: none;']</td>
-	<td>Text Area</td>
-</tr>
-<tr>
-	<td>waitForVisible</td>
-	<td>//td[@id='cke_contents__19_editor']/iframe</td>
-	<td>CK Editor</td>
-</tr>
-<tr>
-	<td>selectFrame</td>
-	<td>//td[@id='cke_contents__19_editor']/iframe</td>
-	<td>CK Editor</td>
-</tr>
-<tr>
-	<td>waitForText</td>
-	<td>//body</td>
-	<td>MB Category Thread Message Reply Body</td>
-</tr>
-<tr>
-	<td>selectFrame</td>
-	<td>relative=top</td>
-	<td>top</td>
-</tr>
-<tr>
-	<td>clickAtAndWait</td>
-	<td>//input[@value='Publish']</td>
-	<td>Publish</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//h1[@class='header-title']</td>
-	<td>RE: MB Category Thread Message Subject</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//a/strong</td>
-	<td>RE: MB Category Thread Message Subject</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>xPath=(//div[@class='subject']/a/strong)[2]</td>
-	<td>RE: MB Category Thread Message Subject</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//div[5]/table/tbody/tr[1]/td[2]/div[1]/ul/li[1]/span/a/span</td>
-	<td>Mark as an Answer</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>xPath=(//div[@class='thread-body'])[2]</td>
-	<td>MB Category Thread Message Reply Body</td>
-</tr>
-<tr>
-	<td>open</td>
-	<td>/web/guest/home/</td>
-	<td></td>
-</tr>
-<tr>
-	<td>waitForVisible</td>
-	<td>link=Message Boards Test Page</td>
-	<td>Message Boards Test Page</td>
-</tr>
-<tr>
-	<td>clickAtAndWait</td>
-	<td>link=Message Boards Test Page</td>
-	<td>Message Boards Test Page</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//a/strong</td>
-	<td>MB Category Name</td>
-</tr>
-<tr>
-	<td>clickAtAndWait</td>
-	<td>//a/strong</td>
-	<td>MB Category Name</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//td[1]/a</td>
-	<td>MB Category Thread Message Subject</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//td[2]/a</td>
-	<td>Waiting for an Answer</td>
-</tr>
-</tbody></table>
-</body>
-</html>
\ No newline at end of file
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/unmarkmbcategorymessagequestionreply/AddMBCategoryMessageQuestionTest.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/unmarkmbcategorymessagequestionreply/AddMBCategoryMessageQuestionTest.html
deleted file mode 100644
index 373c901436e706..00000000000000
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/unmarkmbcategorymessagequestionreply/AddMBCategoryMessageQuestionTest.html
+++ /dev/null
@@ -1,183 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>AddMBCategoryMessageQuestionTest</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-<thead>
-<tr><td rowspan="1" colspan="3">AddMBCategoryMessageQuestionTest</td></tr>
-</thead><tbody>
-<tr>
-	<td>open</td>
-	<td>/web/guest/home/</td>
-	<td></td>
-</tr>
-<tr>
-	<td>waitForVisible</td>
-	<td>link=Message Boards Test Page</td>
-	<td>Message Boards Test Page</td>
-</tr>
-<tr>
-	<td>clickAtAndWait</td>
-	<td>link=Message Boards Test Page</td>
-	<td>Message Boards Test Page</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//a/strong</td>
-	<td>MB Category Name</td>
-</tr>
-<tr>
-	<td>clickAtAndWait</td>
-	<td>//a/strong</td>
-	<td>MB Category Name</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//h1[@class='header-title']/span</td>
-	<td>MB Category Name</td>
-</tr>
-<tr>
-	<td>clickAtAndWait</td>
-	<td>//input[@value='Post New Thread']</td>
-	<td>Post New Thread</td>
-</tr>
-<tr>
-	<td>type</td>
-	<td>//input[@id='_19_subject']</td>
-	<td>MB Category Thread Message Subject</td>
-</tr>
-<tr>
-	<td>waitForElementPresent</td>
-	<td>//textarea[@id='_19_editor' and @style='display: none;']</td>
-	<td>Text Area</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//span[.='Source']</td>
-	<td>Source</td>
-</tr>
-<tr>
-	<td>clickAt</td>
-	<td>//span[.='Source']</td>
-	<td>Source</td>
-</tr>
-<tr>
-	<td>waitForVisible</td>
-	<td>//a[@class='cke_button_source cke_on']</td>
-	<td>Source Button On</td>
-</tr>
-<tr>
-	<td>waitForVisible</td>
-	<td>//td[@id='cke_contents__19_editor']/textarea</td>
-	<td>CK Editor</td>
-</tr>
-<tr>
-	<td>type</td>
-	<td>//td[@id='cke_contents__19_editor']/textarea</td>
-	<td>MB Category Thread Message Body</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//span[.='Source']</td>
-	<td>Source</td>
-</tr>
-<tr>
-	<td>clickAt</td>
-	<td>//span[.='Source']</td>
-	<td>Source</td>
-</tr>
-<tr>
-	<td>waitForElementPresent</td>
-	<td>//textarea[@id='_19_editor' and @style='display: none;']</td>
-	<td>Text Area</td>
-</tr>
-<tr>
-	<td>waitForVisible</td>
-	<td>//td[@id='cke_contents__19_editor']/iframe</td>
-	<td>CK Editor</td>
-</tr>
-<tr>
-	<td>selectFrame</td>
-	<td>//td[@id='cke_contents__19_editor']/iframe</td>
-	<td>CK Editor</td>
-</tr>
-<tr>
-	<td>waitForText</td>
-	<td>//body</td>
-	<td>MB Category Thread Message Body</td>
-</tr>
-<tr>
-	<td>selectFrame</td>
-	<td>relative=top</td>
-	<td>top</td>
-</tr>
-<tr>
-	<td>assertNotChecked</td>
-	<td>//input[@id='_19_questionCheckbox']</td>
-	<td>Mark as a Question</td>
-</tr>
-<tr>
-	<td>clickAt</td>
-	<td>//input[@id='_19_questionCheckbox']</td>
-	<td>Mark as a Question</td>
-</tr>
-<tr>
-	<td>clickAtAndWait</td>
-	<td>//input[@value='Publish']</td>
-	<td>Publish</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//div[@class='portlet-msg-success']</td>
-	<td>Your request completed successfully.</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//div[@class='subject']/a/strong</td>
-	<td>MB Category Thread Message Subject</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//div[@class='thread-body']</td>
-	<td>MB Category Thread Message Body</td>
-</tr>
-<tr>
-	<td>open</td>
-	<td>/web/guest/home/</td>
-	<td></td>
-</tr>
-<tr>
-	<td>waitForVisible</td>
-	<td>link=Message Boards Test Page</td>
-	<td>Message Boards Test Page</td>
-</tr>
-<tr>
-	<td>clickAtAndWait</td>
-	<td>link=Message Boards Test Page</td>
-	<td>Message Boards Test Page</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//a/strong</td>
-	<td>MB Category Name</td>
-</tr>
-<tr>
-	<td>clickAtAndWait</td>
-	<td>//a/strong</td>
-	<td>MB Category Name</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//td[1]/a</td>
-	<td>MB Category Thread Message Subject</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//td[2]/a</td>
-	<td>Waiting for an Answer</td>
-</tr>
-</tbody></table>
-</body>
-</html>
\ No newline at end of file
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/unmarkmbcategorymessagequestionreply/MarkAsAnswerMBCategoryMessageQuestionReplyTest.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/unmarkmbcategorymessagequestionreply/MarkAsAnswerMBCategoryMessageQuestionReplyTest.html
deleted file mode 100644
index 0971f8824c6d6d..00000000000000
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/unmarkmbcategorymessagequestionreply/MarkAsAnswerMBCategoryMessageQuestionReplyTest.html
+++ /dev/null
@@ -1,124 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>MarkAsAnswerMBCategoryMessageQuestionReplyTest</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-<thead>
-<tr><td rowspan="1" colspan="3">MarkAsAnswerMBCategoryMessageQuestionReplyTest</td></tr>
-</thead><tbody>
-<tr>
-	<td>open</td>
-	<td>/web/guest/home/</td>
-	<td></td>
-</tr>
-<tr>
-	<td>waitForVisible</td>
-	<td>link=Message Boards Test Page</td>
-	<td>Message Boards Test Page</td>
-</tr>
-<tr>
-	<td>clickAtAndWait</td>
-	<td>link=Message Boards Test Page</td>
-	<td>Message Boards Test Page</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//a/strong</td>
-	<td>MB Category Name</td>
-</tr>
-<tr>
-	<td>clickAtAndWait</td>
-	<td>//a/strong</td>
-	<td>MB Category Name</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//td[1]/a</td>
-	<td>MB Category Thread Message Subject</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//td[2]/a</td>
-	<td>Waiting for an Answer</td>
-</tr>
-<tr>
-	<td>clickAtAndWait</td>
-	<td>//td[1]/a</td>
-	<td>MB Category Thread Message Subject</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//div[5]/table/tbody/tr[1]/td[2]/div[1]/ul/li[1]/span/a/span</td>
-	<td>Mark as an Answer</td>
-</tr>
-<tr>
-	<td>clickAt</td>
-	<td>//div[5]/table/tbody/tr[1]/td[2]/div[1]/ul/li[1]/span/a/span</td>
-	<td>Mark as an Answer</td>
-</tr>
-<tr>
-	<td>waitForNotVisible</td>
-	<td>//div[5]/table/tbody/tr[1]/td[2]/div[1]/ul/li[1]/span/a/span</td>
-	<td>Mark as an Answer</td>
-</tr>
-<tr>
-	<td>assertNotVisible</td>
-	<td>//div[5]/table/tbody/tr[1]/td[2]/div[1]/ul/li[1]/span/a/span</td>
-	<td>Mark as an Answer</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//div[5]/table/tbody/tr[1]/td[2]/div[1]/div/div[2]/span/span</td>
-	<td>Answer</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//div[5]/table/tbody/tr[1]/td[2]/div[1]/div/div[2]/a</td>
-	<td>Unmark</td>
-</tr>
-<tr>
-	<td>open</td>
-	<td>/web/guest/home/</td>
-	<td></td>
-</tr>
-<tr>
-	<td>waitForVisible</td>
-	<td>link=Message Boards Test Page</td>
-	<td>Message Boards Test Page</td>
-</tr>
-<tr>
-	<td>clickAtAndWait</td>
-	<td>link=Message Boards Test Page</td>
-	<td>Message Boards Test Page</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//a/strong</td>
-	<td>MB Category Name</td>
-</tr>
-<tr>
-	<td>clickAtAndWait</td>
-	<td>//a/strong</td>
-	<td>MB Category Name</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//td[1]/a</td>
-	<td>MB Category Thread Message Subject</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//td[2]/a</td>
-	<td>Resolved</td>
-</tr>
-<tr>
-	<td>assertNotText</td>
-	<td>//td[2]/a</td>
-	<td>Waiting for an Answer</td>
-</tr>
-
-</tbody></table>
-</body>
-</html>
\ No newline at end of file
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/unmarkmbcategorymessagequestionreply/UnmarkMBCategoryMessageQuestionReplyTests.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/unmarkmbcategorymessagequestionreply/UnmarkMBCategoryMessageQuestionReplyTests.html
deleted file mode 100644
index dca22adf9f3251..00000000000000
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/unmarkmbcategorymessagequestionreply/UnmarkMBCategoryMessageQuestionReplyTests.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <meta content="text/html; charset=UTF-8" http-equiv="content-type" />
-  <title>UnmarkMBCategoryMessageQuestionReplyTests</title>
-</head>
-<body>
-<table id="suiteTable" cellpadding="1" cellspacing="1" border="1" class="selenium"><tbody>
-<tr><td><b>UnmarkMBCategoryMessageQuestionReplyTests</b></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPageMBTest.html">AddPageMBTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPortletMBTest.html">AddPortletMBTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/AddMBCategoryTest.html">AddMBCategoryTest</a></td></tr>
-<tr><td><a href="AddMBCategoryMessageQuestionTest.html">AddMBCategoryMessageQuestionTest</a></td></tr>
-<tr><td><a href="AddMBCategoryMessageQuestionReplyTest.html">AddMBCategoryMessageQuestionReplyTest</a></td></tr>
-<tr><td><a href="MarkAsAnswerMBCategoryMessageQuestionReplyTest.html">MarkAsAnswerMBCategoryMessageQuestionReplyTest</a></td></tr>
-<tr><td><a href="UnmarkMBCategoryMessageQuestionReplyTest.html">UnmarkMBCategoryMessageQuestionReplyTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/TearDownMBCategoryTest.html">TearDownMBCategoryTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portal/util/TearDownPageTest.html">TearDownPageTest</a></td></tr>
-</tbody></table>
-</body>
-</html>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/unmarkmbcategorymessagequestionreply/UnmarkMBCategoryMessageQuestionReplyTests.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/unmarkmbcategorymessagequestionreply/UnmarkMBCategoryMessageQuestionReplyTests.java
deleted file mode 100644
index 2873c7d892760e..00000000000000
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/unmarkmbcategorymessagequestionreply/UnmarkMBCategoryMessageQuestionReplyTests.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- * Copyright (c) 2000-2012 Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- */
-
-package com.liferay.portalweb.portlet.messageboards.mbmessage.unmarkmbcategorymessagequestionreply;
-
-import com.liferay.portalweb.portal.BaseTestSuite;
-import com.liferay.portalweb.portal.util.TearDownPageTest;
-import com.liferay.portalweb.portlet.messageboards.mbcategory.addmbcategory.AddMBCategoryTest;
-import com.liferay.portalweb.portlet.messageboards.mbcategory.addmbcategory.TearDownMBCategoryTest;
-import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPageMBTest;
-import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPortletMBTest;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-/**
- * @author Brian Wing Shun Chan
- */
-public class UnmarkMBCategoryMessageQuestionReplyTests extends BaseTestSuite {
-	public static Test suite() {
-		TestSuite testSuite = new TestSuite();
-		testSuite.addTestSuite(AddPageMBTest.class);
-		testSuite.addTestSuite(AddPortletMBTest.class);
-		testSuite.addTestSuite(AddMBCategoryTest.class);
-		testSuite.addTestSuite(AddMBCategoryMessageQuestionTest.class);
-		testSuite.addTestSuite(AddMBCategoryMessageQuestionReplyTest.class);
-		testSuite.addTestSuite(MarkAsAnswerMBCategoryMessageQuestionReplyTest.class);
-		testSuite.addTestSuite(UnmarkMBCategoryMessageQuestionReplyTest.class);
-		testSuite.addTestSuite(TearDownMBCategoryTest.class);
-		testSuite.addTestSuite(TearDownPageTest.class);
-
-		return testSuite;
-	}
-}
\ No newline at end of file
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/viewmbcategorymessagemyposts/ViewMBCategoryMessageMyPostsTests.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/viewmbcategorymessagemyposts/ViewMBCategoryMessageMyPostsTests.html
deleted file mode 100644
index 3151b02b359494..00000000000000
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/viewmbcategorymessagemyposts/ViewMBCategoryMessageMyPostsTests.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <meta content="text/html; charset=UTF-8" http-equiv="content-type" />
-  <title>ViewMBCategoryMessageMyPostsTests</title>
-</head>
-<body>
-<table id="suiteTable" cellpadding="1" cellspacing="1" border="1" class="selenium"><tbody>
-<tr><td><b>ViewMBCategoryMessageMyPostsTests</b></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPageMBTest.html">AddPageMBTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPortletMBTest.html">AddPortletMBTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/AddMBCategoryTest.html">AddMBCategoryTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThreadMessageTest.html">PostNewMBCategoryThreadMessageTest</a></td></tr>
-<tr><td><a href="ViewMBCategoryMessageMyPostsTest.html">ViewMBCategoryMessageMyPostsTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/TearDownMBCategoryTest.html">TearDownMBCategoryTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portal/util/TearDownPageTest.html">TearDownPageTest</a></td></tr>
-</tbody></table>
-</body>
-</html>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/viewmbcategorymessagemyposts/ViewMBCategoryMessageMyPostsTests.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/viewmbcategorymessagemyposts/ViewMBCategoryMessageMyPostsTests.java
deleted file mode 100644
index 4f10cdaba8d264..00000000000000
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/viewmbcategorymessagemyposts/ViewMBCategoryMessageMyPostsTests.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * Copyright (c) 2000-2012 Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- */
-
-package com.liferay.portalweb.portlet.messageboards.mbmessage.viewmbcategorymessagemyposts;
-
-import com.liferay.portalweb.portal.BaseTestSuite;
-import com.liferay.portalweb.portal.util.TearDownPageTest;
-import com.liferay.portalweb.portlet.messageboards.mbcategory.addmbcategory.AddMBCategoryTest;
-import com.liferay.portalweb.portlet.messageboards.mbcategory.addmbcategory.TearDownMBCategoryTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbcategorythreadmessage.PostNewMBCategoryThreadMessageTest;
-import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPageMBTest;
-import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPortletMBTest;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-/**
- * @author Brian Wing Shun Chan
- */
-public class ViewMBCategoryMessageMyPostsTests extends BaseTestSuite {
-	public static Test suite() {
-		TestSuite testSuite = new TestSuite();
-		testSuite.addTestSuite(AddPageMBTest.class);
-		testSuite.addTestSuite(AddPortletMBTest.class);
-		testSuite.addTestSuite(AddMBCategoryTest.class);
-		testSuite.addTestSuite(PostNewMBCategoryThreadMessageTest.class);
-		testSuite.addTestSuite(ViewMBCategoryMessageMyPostsTest.class);
-		testSuite.addTestSuite(TearDownMBCategoryTest.class);
-		testSuite.addTestSuite(TearDownPageTest.class);
-
-		return testSuite;
-	}
-}
\ No newline at end of file
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/viewmbcategorymessagepostcount/ViewMBCategoryMessagePostCountTests.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/viewmbcategorymessagepostcount/ViewMBCategoryMessagePostCountTests.html
deleted file mode 100644
index 9f5c4295ef0f5d..00000000000000
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/viewmbcategorymessagepostcount/ViewMBCategoryMessagePostCountTests.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <meta content="text/html; charset=UTF-8" http-equiv="content-type" />
-  <title>Test Suite</title>
-</head>
-<body>
-<table id="suiteTable" cellpadding="1" cellspacing="1" border="1" class="selenium"><tbody>
-<tr><td><b>Test Suite</b></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPageMBTest.html">AddPageMBTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPortletMBTest.html">AddPortletMBTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/AddMBCategoryTest.html">AddMBCategoryTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThread1MessageTest.html">PostNewMBCategoryThread1MessageTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThread2MessageTest.html">PostNewMBCategoryThread2MessageTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThread3MessageTest.html">PostNewMBCategoryThread3MessageTest</a></td></tr>
-<tr><td><a href="AddMBCategoryMessage1Reply1Test.html">AddMBCategoryMessage1Reply1Test</a></td></tr>
-<tr><td><a href="AddMBCategoryMessage1Reply2Test.html">AddMBCategoryMessage1Reply2Test</a></td></tr>
-<tr><td><a href="AddMBCategoryMessage1Reply3Test.html">AddMBCategoryMessage1Reply3Test</a></td></tr>
-<tr><td><a href="ViewMBCategoryMessagePostCountTest.html">ViewMBCategoryMessagePostCountTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/TearDownMBCategoryTest.html">TearDownMBCategoryTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portal/util/TearDownPageTest.html">TearDownPageTest</a></td></tr>
-</tbody></table>
-</body>
-</html>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/viewmbcategorymessagepostcount/ViewMBCategoryMessagePostCountTests.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/viewmbcategorymessagepostcount/ViewMBCategoryMessagePostCountTests.java
deleted file mode 100644
index c542b20b4cac6e..00000000000000
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/viewmbcategorymessagepostcount/ViewMBCategoryMessagePostCountTests.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
- * Copyright (c) 2000-2012 Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- */
-
-package com.liferay.portalweb.portlet.messageboards.mbmessage.viewmbcategorymessagepostcount;
-
-import com.liferay.portalweb.portal.BaseTestSuite;
-import com.liferay.portalweb.portal.util.TearDownPageTest;
-import com.liferay.portalweb.portlet.messageboards.mbcategory.addmbcategory.AddMBCategoryTest;
-import com.liferay.portalweb.portlet.messageboards.mbcategory.addmbcategory.TearDownMBCategoryTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbcategorythreadmessage.PostNewMBCategoryThread1MessageTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbcategorythreadmessage.PostNewMBCategoryThread2MessageTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbcategorythreadmessage.PostNewMBCategoryThread3MessageTest;
-import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPageMBTest;
-import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPortletMBTest;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-/**
- * @author Brian Wing Shun Chan
- */
-public class ViewMBCategoryMessagePostCountTests extends BaseTestSuite {
-	public static Test suite() {
-		TestSuite testSuite = new TestSuite();
-		testSuite.addTestSuite(AddPageMBTest.class);
-		testSuite.addTestSuite(AddPortletMBTest.class);
-		testSuite.addTestSuite(AddMBCategoryTest.class);
-		testSuite.addTestSuite(PostNewMBCategoryThread1MessageTest.class);
-		testSuite.addTestSuite(PostNewMBCategoryThread2MessageTest.class);
-		testSuite.addTestSuite(PostNewMBCategoryThread3MessageTest.class);
-		testSuite.addTestSuite(AddMBCategoryMessage1Reply1Test.class);
-		testSuite.addTestSuite(AddMBCategoryMessage1Reply2Test.class);
-		testSuite.addTestSuite(AddMBCategoryMessage1Reply3Test.class);
-		testSuite.addTestSuite(ViewMBCategoryMessagePostCountTest.class);
-		testSuite.addTestSuite(TearDownMBCategoryTest.class);
-		testSuite.addTestSuite(TearDownPageTest.class);
-
-		return testSuite;
-	}
-}
\ No newline at end of file
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/viewmbcategorymessagerecentposts/ViewMBCategoryMessageRecentPostsTests.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/viewmbcategorymessagerecentposts/ViewMBCategoryMessageRecentPostsTests.html
deleted file mode 100644
index fb5078bfe0ece0..00000000000000
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/viewmbcategorymessagerecentposts/ViewMBCategoryMessageRecentPostsTests.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <meta content="text/html; charset=UTF-8" http-equiv="content-type" />
-  <title>ViewMBCategoryMessageRecentPostsTests</title>
-</head>
-<body>
-<table id="suiteTable" cellpadding="1" cellspacing="1" border="1" class="selenium"><tbody>
-<tr><td><b>ViewMBCategoryMessageRecentPostsTests</b></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPageMBTest.html">AddPageMBTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPortletMBTest.html">AddPortletMBTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/AddMBCategoryTest.html">AddMBCategoryTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThreadMessageTest.html">PostNewMBCategoryThreadMessageTest</a></td></tr>
-<tr><td><a href="ViewMBCategoryMessageRecentPostsTest.html">ViewMBCategoryMessageRecentPostsTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/TearDownMBCategoryTest.html">TearDownMBCategoryTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portal/util/TearDownPageTest.html">TearDownPageTest</a></td></tr>
-</tbody></table>
-</body>
-</html>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/viewmbcategorymessagerecentposts/ViewMBCategoryMessageRecentPostsTests.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/viewmbcategorymessagerecentposts/ViewMBCategoryMessageRecentPostsTests.java
deleted file mode 100644
index 48ac29b8f5d58b..00000000000000
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/viewmbcategorymessagerecentposts/ViewMBCategoryMessageRecentPostsTests.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * Copyright (c) 2000-2012 Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- */
-
-package com.liferay.portalweb.portlet.messageboards.mbmessage.viewmbcategorymessagerecentposts;
-
-import com.liferay.portalweb.portal.BaseTestSuite;
-import com.liferay.portalweb.portal.util.TearDownPageTest;
-import com.liferay.portalweb.portlet.messageboards.mbcategory.addmbcategory.AddMBCategoryTest;
-import com.liferay.portalweb.portlet.messageboards.mbcategory.addmbcategory.TearDownMBCategoryTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbcategorythreadmessage.PostNewMBCategoryThreadMessageTest;
-import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPageMBTest;
-import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPortletMBTest;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-/**
- * @author Brian Wing Shun Chan
- */
-public class ViewMBCategoryMessageRecentPostsTests extends BaseTestSuite {
-	public static Test suite() {
-		TestSuite testSuite = new TestSuite();
-		testSuite.addTestSuite(AddPageMBTest.class);
-		testSuite.addTestSuite(AddPortletMBTest.class);
-		testSuite.addTestSuite(AddMBCategoryTest.class);
-		testSuite.addTestSuite(PostNewMBCategoryThreadMessageTest.class);
-		testSuite.addTestSuite(ViewMBCategoryMessageRecentPostsTest.class);
-		testSuite.addTestSuite(TearDownMBCategoryTest.class);
-		testSuite.addTestSuite(TearDownPageTest.class);
-
-		return testSuite;
-	}
-}
\ No newline at end of file
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/MBMessageTestPlan.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/MBMessageTestPlan.java
new file mode 100644
index 00000000000000..d3a104a9627e15
--- /dev/null
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/MBMessageTestPlan.java
@@ -0,0 +1,121 @@
+/**
+ * Copyright (c) 2000-2012 Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package com.liferay.portalweb.portlet.messageboards.mbmessage;
+
+import com.liferay.portalweb.portal.BaseTestSuite;
+import com.liferay.portalweb.portlet.messageboards.mbthread.deletemarkasanswermbcategoryquestionreply.DeleteMarkAsAnswerMBCategoryQuestionReplyTests;
+import com.liferay.portalweb.portlet.messageboards.mbthread.deletembcategorythread.DeleteMBCategoryThreadTests;
+import com.liferay.portalweb.portlet.messageboards.mbthread.editmbcategorythreadbody.EditMBCategoryThreadBodyTests;
+import com.liferay.portalweb.portlet.messageboards.mbthread.editmbcategorythreadbodynull.EditMBCategoryThreadBodyNullTests;
+import com.liferay.portalweb.portlet.messageboards.mbthread.editmbcategorythreadsubject.EditMBCategoryThreadSubjectTests;
+import com.liferay.portalweb.portlet.messageboards.mbthread.editmbcategorythreadsubjectnull.EditMBCategoryThreadSubjectNullTests;
+import com.liferay.portalweb.portlet.messageboards.mbthread.guestviewmbthreadguestviewoff.Guest_ViewMBThreadGuestViewOffTests;
+import com.liferay.portalweb.portlet.messageboards.mbthread.markasanswermbcategorythreadquestionreply.MarkAsAnswerMBCategoryThreadQuestionReplyTests;
+import com.liferay.portalweb.portlet.messageboards.mbthread.movembcategorythreadtocategory.MoveMBCategoryThreadToCategoryTests;
+import com.liferay.portalweb.portlet.messageboards.mbthread.movembcategorythreadtocategoryexplanation.MoveMBCategoryThreadToCategoryExplanationTests;
+import com.liferay.portalweb.portlet.messageboards.mbthread.nextmbcategorythread.NextMBCategoryThreadTests;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbcategoriesthread.PostNewMBCategoriesThreadTests;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbcategorythread.PostNewMBCategoryThreadTests;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbcategorythreadbodynull.PostNewMBCategoryThreadBodyNullTests;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbcategorythreadquestion.PostNewMBCategoryThreadQuestionTests;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbcategorythreads.PostNewMBCategoryThreadsTests;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbcategorythreadsubjectnull.PostNewMBCategoryThreadSubjectNullTests;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbcategorythreadutf8.PostNewMBCategoryThreadUTF8Tests;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbsubcategorythread.PostNewMBSubcategoryThreadTests;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbsubcategorythreadbodynull.PostNewMBSubcategoryThreadBodyNullTests;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbsubcategorythreads.PostNewMBSubcategoryThreadsTests;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbsubcategorythreadsubjectnull.PostNewMBSubcategoryThreadSubjectNullTests;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbthread.PostNewMBThreadTests;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbthreads.PostNewMBThreadsTests;
+import com.liferay.portalweb.portlet.messageboards.mbthread.previewmbthreaddetails.PreviewMBThreadDetailsTests;
+import com.liferay.portalweb.portlet.messageboards.mbthread.previousmbcategorythread.PreviousMBCategoryThreadTests;
+import com.liferay.portalweb.portlet.messageboards.mbthread.ratembcategorythread.RateMBCategoryThreadTests;
+import com.liferay.portalweb.portlet.messageboards.mbthread.replymbcategorythreadquestionreply.ReplyMBCategoryThreadQuestionReplyTests;
+import com.liferay.portalweb.portlet.messageboards.mbthread.replymbcategorythreadreplies.ReplyMBCategoryThreadRepliesTests;
+import com.liferay.portalweb.portlet.messageboards.mbthread.replymbcategorythreadreply.ReplyMBCategoryThreadReplyTests;
+import com.liferay.portalweb.portlet.messageboards.mbthread.replymbcategorythreadreplyreply.ReplyMBCategoryThreadReplyReplyTests;
+import com.liferay.portalweb.portlet.messageboards.mbthread.replymbthreadreplies.ReplyMBThreadRepliesTests;
+import com.liferay.portalweb.portlet.messageboards.mbthread.replymbthreadreply.ReplyMBThreadReplyTests;
+import com.liferay.portalweb.portlet.messageboards.mbthread.searchmbcategorythread.SearchMBCategoryThreadTests;
+import com.liferay.portalweb.portlet.messageboards.mbthread.splitthreadmbcategorythreadreply.SplitThreadMBCategoryThreadReplyTests;
+import com.liferay.portalweb.portlet.messageboards.mbthread.splitthreadmbcategorythreadreplybackbutton.SplitThreadMBCategoryThreadReplyBackButtonTests;
+import com.liferay.portalweb.portlet.messageboards.mbthread.splitthreadmbcategorythreadreplyexplanation.SplitThreadMBCategoryThreadReplyExplanationTests;
+import com.liferay.portalweb.portlet.messageboards.mbthread.splitthreadmbcategorythreadreplyreply.SplitThreadMBCategoryThreadReplyReplyTests;
+import com.liferay.portalweb.portlet.messageboards.mbthread.unmarkmbcategorythreadquestionreply.UnmarkMBCategoryThreadQuestionReplyTests;
+import com.liferay.portalweb.portlet.messageboards.mbthread.viewmbcategorythreadmyposts.ViewMBCategoryThreadMyPostsTests;
+import com.liferay.portalweb.portlet.messageboards.mbthread.viewmbcategorythreadpostcount.ViewMBCategoryThreadPostCountTests;
+import com.liferay.portalweb.portlet.messageboards.mbthread.viewmbcategorythreadrecentposts.ViewMBCategoryThreadRecentPostsTests;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+/**
+ * @author Brian Wing Shun Chan
+ */
+public class MBMessageTestPlan extends BaseTestSuite {
+
+	public static Test suite() {
+		TestSuite testSuite = new TestSuite();
+		testSuite.addTest(DeleteMarkAsAnswerMBCategoryQuestionReplyTests.suite());
+		testSuite.addTest(DeleteMBCategoryThreadTests.suite());
+		testSuite.addTest(EditMBCategoryThreadBodyTests.suite());
+		testSuite.addTest(EditMBCategoryThreadBodyNullTests.suite());
+		testSuite.addTest(EditMBCategoryThreadSubjectTests.suite());
+		testSuite.addTest(EditMBCategoryThreadSubjectNullTests.suite());
+		testSuite.addTest(Guest_ViewMBThreadGuestViewOffTests.suite());
+		testSuite.addTest(
+			MarkAsAnswerMBCategoryThreadQuestionReplyTests.suite());
+		testSuite.addTest(MoveMBCategoryThreadToCategoryTests.suite());
+		testSuite.addTest(
+			MoveMBCategoryThreadToCategoryExplanationTests.suite());
+		testSuite.addTest(NextMBCategoryThreadTests.suite());
+		testSuite.addTest(PostNewMBCategoriesThreadTests.suite());
+		testSuite.addTest(PostNewMBCategoryThreadTests.suite());
+		testSuite.addTest(PostNewMBCategoryThreadBodyNullTests.suite());
+		testSuite.addTest(PostNewMBCategoryThreadQuestionTests.suite());
+		testSuite.addTest(PostNewMBCategoryThreadsTests.suite());
+		testSuite.addTest(PostNewMBCategoryThreadSubjectNullTests.suite());
+		testSuite.addTest(PostNewMBCategoryThreadUTF8Tests.suite());
+		testSuite.addTest(PostNewMBSubcategoryThreadTests.suite());
+		testSuite.addTest(PostNewMBSubcategoryThreadBodyNullTests.suite());
+		testSuite.addTest(PostNewMBSubcategoryThreadsTests.suite());
+		testSuite.addTest(PostNewMBSubcategoryThreadSubjectNullTests.suite());
+		testSuite.addTest(PostNewMBThreadTests.suite());
+		testSuite.addTest(PostNewMBThreadsTests.suite());
+		testSuite.addTest(PreviewMBThreadDetailsTests.suite());
+		testSuite.addTest(PreviousMBCategoryThreadTests.suite());
+		testSuite.addTest(RateMBCategoryThreadTests.suite());
+		testSuite.addTest(ReplyMBCategoryThreadQuestionReplyTests.suite());
+		testSuite.addTest(ReplyMBCategoryThreadRepliesTests.suite());
+		testSuite.addTest(ReplyMBCategoryThreadReplyTests.suite());
+		testSuite.addTest(ReplyMBCategoryThreadReplyReplyTests.suite());
+		testSuite.addTest(ReplyMBThreadRepliesTests.suite());
+		testSuite.addTest(ReplyMBThreadReplyTests.suite());
+		testSuite.addTest(SearchMBCategoryThreadTests.suite());
+		testSuite.addTest(SplitThreadMBCategoryThreadReplyTests.suite());
+		testSuite.addTest(
+			SplitThreadMBCategoryThreadReplyBackButtonTests.suite());
+		testSuite.addTest(
+			SplitThreadMBCategoryThreadReplyExplanationTests.suite());
+		testSuite.addTest(SplitThreadMBCategoryThreadReplyReplyTests.suite());
+		testSuite.addTest(UnmarkMBCategoryThreadQuestionReplyTests.suite());
+		testSuite.addTest(ViewMBCategoryThreadMyPostsTests.suite());
+		testSuite.addTest(ViewMBCategoryThreadPostCountTests.suite());
+		testSuite.addTest(ViewMBCategoryThreadRecentPostsTests.suite());
+
+		return testSuite;
+	}
+
+}
\ No newline at end of file
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/deletemarkasanswermbcategorymessagereply/DeleteMarkAsAnswerMBCategoryMessageReplyTest.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/deletemarkasanswermbcategoryquestionreply/DeleteMarkAsAnswerMBCategoryQuestionReplyTest.html
similarity index 91%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/deletemarkasanswermbcategorymessagereply/DeleteMarkAsAnswerMBCategoryMessageReplyTest.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/deletemarkasanswermbcategoryquestionreply/DeleteMarkAsAnswerMBCategoryQuestionReplyTest.html
index e04ec489bb58c7..b07b1a1bb704e5 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/deletemarkasanswermbcategorymessagereply/DeleteMarkAsAnswerMBCategoryMessageReplyTest.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/deletemarkasanswermbcategoryquestionreply/DeleteMarkAsAnswerMBCategoryQuestionReplyTest.html
@@ -1,12 +1,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>DeleteMarkAsAnswerMBCategoryMessageReplyTest</title>
+<title>DeleteMarkAsAnswerMBCategoryQuestionReplyTest</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3">DeleteMarkAsAnswerMBCategoryMessageReplyTest</td></tr>
+<tr><td rowspan="1" colspan="3">DeleteMarkAsAnswerMBCategoryQuestionReplyTest</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/deletemarkasanswermbcategorymessagereply/DeleteMarkAsAnswerMBCategoryMessageReplyTest.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/deletemarkasanswermbcategoryquestionreply/DeleteMarkAsAnswerMBCategoryQuestionReplyTest.java
similarity index 92%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/deletemarkasanswermbcategorymessagereply/DeleteMarkAsAnswerMBCategoryMessageReplyTest.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/deletemarkasanswermbcategoryquestionreply/DeleteMarkAsAnswerMBCategoryQuestionReplyTest.java
index cf9d5ab5f72ca5..eaa1da4763cdd3 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/deletemarkasanswermbcategorymessagereply/DeleteMarkAsAnswerMBCategoryMessageReplyTest.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/deletemarkasanswermbcategoryquestionreply/DeleteMarkAsAnswerMBCategoryQuestionReplyTest.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.deletemarkasanswermbcategorymessagereply;
+package com.liferay.portalweb.portlet.messageboards.mbthread.deletemarkasanswermbcategoryquestionreply;
 
 import com.liferay.portalweb.portal.BaseTestCase;
 import com.liferay.portalweb.portal.util.RuntimeVariables;
@@ -20,8 +20,8 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class DeleteMarkAsAnswerMBCategoryMessageReplyTest extends BaseTestCase {
-	public void testDeleteMarkAsAnswerMBCategoryMessageReply()
+public class DeleteMarkAsAnswerMBCategoryQuestionReplyTest extends BaseTestCase {
+	public void testDeleteMarkAsAnswerMBCategoryQuestionReply()
 		throws Exception {
 		selenium.open("/web/guest/home/");
 		loadRequiredJavaScriptModules();
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/deletemarkasanswermbcategoryquestionreply/DeleteMarkAsAnswerMBCategoryQuestionReplyTests.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/deletemarkasanswermbcategoryquestionreply/DeleteMarkAsAnswerMBCategoryQuestionReplyTests.html
new file mode 100644
index 00000000000000..a4a6ab0a6a9758
--- /dev/null
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/deletemarkasanswermbcategoryquestionreply/DeleteMarkAsAnswerMBCategoryQuestionReplyTests.html
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+  <meta content="text/html; charset=UTF-8" http-equiv="content-type" />
+  <title>DeleteMarkAsAnswerMBCategoryQuestionReplyTests</title>
+</head>
+<body>
+<table id="suiteTable" cellpadding="1" cellspacing="1" border="1" class="selenium"><tbody>
+<tr><td><b>DeleteMarkAsAnswerMBCategoryQuestionReplyTests</b></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPageMBTest.html">AddPageMBTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPortletMBTest.html">AddPortletMBTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/AddMBCategoryTest.html">AddMBCategoryTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/postnewmbcategorythreadquestion/PostNewMBCategoryThreadQuestionTest.html">PostNewMBCategoryThreadQuestionTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/replymbcategorythreadquestionreply/ReplyMBCategoryThreadQuestionReplyTest.html">ReplyMBCategoryThreadQuestionReplyTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/markasanswermbcategorythreadquestionreply/MarkAsAnswerMBCategoryThreadQuestionReplyTest.html">MarkAsAnswerMBCategoryThreadQuestionReplyTest</a></td></tr>
+<tr><td><a href="DeleteMarkAsAnswerMBCategoryQuestionReplyTest.html">DeleteMarkAsAnswerMBCategoryQuestionReplyTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/TearDownMBCategoryTest.html">TearDownMBCategoryTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portal/util/TearDownPageTest.html">TearDownPageTest</a></td></tr>
+</tbody></table>
+</body>
+</html>
\ No newline at end of file
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/splitthreadmbcategorymessagereplyexplanation/SplitThreadMBCategoryMessageReplyExplanationTests.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/deletemarkasanswermbcategoryquestionreply/DeleteMarkAsAnswerMBCategoryQuestionReplyTests.java
similarity index 63%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/splitthreadmbcategorymessagereplyexplanation/SplitThreadMBCategoryMessageReplyExplanationTests.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/deletemarkasanswermbcategoryquestionreply/DeleteMarkAsAnswerMBCategoryQuestionReplyTests.java
index d7dc171f5a16ae..4b8e9d84017f7f 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/splitthreadmbcategorymessagereplyexplanation/SplitThreadMBCategoryMessageReplyExplanationTests.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/deletemarkasanswermbcategoryquestionreply/DeleteMarkAsAnswerMBCategoryQuestionReplyTests.java
@@ -12,15 +12,15 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.splitthreadmbcategorymessagereplyexplanation;
+package com.liferay.portalweb.portlet.messageboards.mbthread.deletemarkasanswermbcategoryquestionreply;
 
 import com.liferay.portalweb.portal.BaseTestSuite;
 import com.liferay.portalweb.portal.util.TearDownPageTest;
 import com.liferay.portalweb.portlet.messageboards.mbcategory.addmbcategory.AddMBCategoryTest;
 import com.liferay.portalweb.portlet.messageboards.mbcategory.addmbcategory.TearDownMBCategoryTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbcategorythreadmessage.PostNewMBCategoryThreadMessageTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbthreadmessage.TearDownMBThreadTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.replymbcategorythreadmessagereply.ReplyMBCategoryThreadMessageReplyTest;
+import com.liferay.portalweb.portlet.messageboards.mbthread.markasanswermbcategorythreadquestionreply.MarkAsAnswerMBCategoryThreadQuestionReplyTest;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbcategorythreadquestion.PostNewMBCategoryThreadQuestionTest;
+import com.liferay.portalweb.portlet.messageboards.mbthread.replymbcategorythreadquestionreply.ReplyMBCategoryThreadQuestionReplyTest;
 import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPageMBTest;
 import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPortletMBTest;
 
@@ -30,19 +30,18 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class SplitThreadMBCategoryMessageReplyExplanationTests
+public class DeleteMarkAsAnswerMBCategoryQuestionReplyTests
 	extends BaseTestSuite {
 	public static Test suite() {
 		TestSuite testSuite = new TestSuite();
 		testSuite.addTestSuite(AddPageMBTest.class);
 		testSuite.addTestSuite(AddPortletMBTest.class);
 		testSuite.addTestSuite(AddMBCategoryTest.class);
-		testSuite.addTestSuite(PostNewMBCategoryThreadMessageTest.class);
-		testSuite.addTestSuite(ReplyMBCategoryThreadMessageReplyTest.class);
-		testSuite.addTestSuite(SplitThreadMBCategoryMessageReplyExplanationTest.class);
-		testSuite.addTestSuite(ViewSplitThreadMBCategoryMessageReplyExplanationTest.class);
+		testSuite.addTestSuite(PostNewMBCategoryThreadQuestionTest.class);
+		testSuite.addTestSuite(ReplyMBCategoryThreadQuestionReplyTest.class);
+		testSuite.addTestSuite(MarkAsAnswerMBCategoryThreadQuestionReplyTest.class);
+		testSuite.addTestSuite(DeleteMarkAsAnswerMBCategoryQuestionReplyTest.class);
 		testSuite.addTestSuite(TearDownMBCategoryTest.class);
-		testSuite.addTestSuite(TearDownMBThreadTest.class);
 		testSuite.addTestSuite(TearDownPageTest.class);
 
 		return testSuite;
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/deletembcategorymessage/DeleteMBCategoryMessageTest.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/deletembcategorythread/DeleteMBCategoryThreadTest.html
similarity index 93%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/deletembcategorymessage/DeleteMBCategoryMessageTest.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/deletembcategorythread/DeleteMBCategoryThreadTest.html
index d9cb1a2692c8c3..4d9ea5e955806b 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/deletembcategorymessage/DeleteMBCategoryMessageTest.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/deletembcategorythread/DeleteMBCategoryThreadTest.html
@@ -1,12 +1,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>DeleteMBCategoryMessageTest</title>
+<title>DeleteMBCategoryThreadTest</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3">DeleteMBCategoryMessageTest</td></tr>
+<tr><td rowspan="1" colspan="3">DeleteMBCategoryThreadTest</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/deletembcategorymessage/DeleteMBCategoryMessageTest.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/deletembcategorythread/DeleteMBCategoryThreadTest.java
similarity index 92%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/deletembcategorymessage/DeleteMBCategoryMessageTest.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/deletembcategorythread/DeleteMBCategoryThreadTest.java
index e6fd9e92799009..0f5c73507eaa8d 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/deletembcategorymessage/DeleteMBCategoryMessageTest.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/deletembcategorythread/DeleteMBCategoryThreadTest.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.deletembcategorymessage;
+package com.liferay.portalweb.portlet.messageboards.mbthread.deletembcategorythread;
 
 import com.liferay.portalweb.portal.BaseTestCase;
 import com.liferay.portalweb.portal.util.RuntimeVariables;
@@ -20,8 +20,8 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class DeleteMBCategoryMessageTest extends BaseTestCase {
-	public void testDeleteMBCategoryMessage() throws Exception {
+public class DeleteMBCategoryThreadTest extends BaseTestCase {
+	public void testDeleteMBCategoryThread() throws Exception {
 		selenium.open("/web/guest/home/");
 		loadRequiredJavaScriptModules();
 
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/deletembcategorythread/DeleteMBCategoryThreadTests.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/deletembcategorythread/DeleteMBCategoryThreadTests.html
new file mode 100644
index 00000000000000..41a1059f696e5c
--- /dev/null
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/deletembcategorythread/DeleteMBCategoryThreadTests.html
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+  <meta content="text/html; charset=UTF-8" http-equiv="content-type" />
+  <title>DeleteMBCategoryThreadTests</title>
+</head>
+<body>
+<table id="suiteTable" cellpadding="1" cellspacing="1" border="1" class="selenium"><tbody>
+<tr><td><b>DeleteMBCategoryThreadTests</b></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPageMBTest.html">AddPageMBTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPortletMBTest.html">AddPortletMBTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/AddMBCategoryTest.html">AddMBCategoryTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategoryThreadTest.html">PostNewMBCategoryThreadTest</a></td></tr>
+<tr><td><a href="DeleteMBCategoryThreadTest.html">DeleteMBCategoryThreadTest</a></td></tr>
+<tr><td><a href="ViewDeleteMBCategoryThreadTest.html">ViewDeleteMBCategoryThreadTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/TearDownMBCategoryTest.html">TearDownMBCategoryTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portal/util/TearDownPageTest.html">TearDownPageTest</a></td></tr>
+</tbody></table>
+</body>
+</html>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/deletembcategorythread/DeleteMBCategoryThreadTests.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/deletembcategorythread/DeleteMBCategoryThreadTests.java
new file mode 100644
index 00000000000000..f3ec75354e2352
--- /dev/null
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/deletembcategorythread/DeleteMBCategoryThreadTests.java
@@ -0,0 +1,45 @@
+/**
+ * Copyright (c) 2000-2012 Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package com.liferay.portalweb.portlet.messageboards.mbthread.deletembcategorythread;
+
+import com.liferay.portalweb.portal.BaseTestSuite;
+import com.liferay.portalweb.portal.util.TearDownPageTest;
+import com.liferay.portalweb.portlet.messageboards.mbcategory.addmbcategory.AddMBCategoryTest;
+import com.liferay.portalweb.portlet.messageboards.mbcategory.addmbcategory.TearDownMBCategoryTest;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbcategorythread.PostNewMBCategoryThreadTest;
+import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPageMBTest;
+import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPortletMBTest;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+/**
+ * @author Brian Wing Shun Chan
+ */
+public class DeleteMBCategoryThreadTests extends BaseTestSuite {
+	public static Test suite() {
+		TestSuite testSuite = new TestSuite();
+		testSuite.addTestSuite(AddPageMBTest.class);
+		testSuite.addTestSuite(AddPortletMBTest.class);
+		testSuite.addTestSuite(AddMBCategoryTest.class);
+		testSuite.addTestSuite(PostNewMBCategoryThreadTest.class);
+		testSuite.addTestSuite(DeleteMBCategoryThreadTest.class);
+		testSuite.addTestSuite(ViewDeleteMBCategoryThreadTest.class);
+		testSuite.addTestSuite(TearDownMBCategoryTest.class);
+		testSuite.addTestSuite(TearDownPageTest.class);
+
+		return testSuite;
+	}
+}
\ No newline at end of file
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/deletembcategorymessage/ViewDeleteMBCategoryMessageTest.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/deletembcategorythread/ViewDeleteMBCategoryThreadTest.html
similarity index 88%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/deletembcategorymessage/ViewDeleteMBCategoryMessageTest.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/deletembcategorythread/ViewDeleteMBCategoryThreadTest.html
index 3d3dc571f4d664..da868509ef806c 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/deletembcategorymessage/ViewDeleteMBCategoryMessageTest.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/deletembcategorythread/ViewDeleteMBCategoryThreadTest.html
@@ -1,12 +1,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>ViewDeleteMBCategoryMessageTest</title>
+<title>ViewDeleteMBCategoryThreadTest</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3">ViewDeleteMBCategoryMessageTest</td></tr>
+<tr><td rowspan="1" colspan="3">ViewDeleteMBCategoryThreadTest</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/deletembcategorymessage/ViewDeleteMBCategoryMessageTest.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/deletembcategorythread/ViewDeleteMBCategoryThreadTest.java
similarity index 89%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/deletembcategorymessage/ViewDeleteMBCategoryMessageTest.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/deletembcategorythread/ViewDeleteMBCategoryThreadTest.java
index e2eeea4c3568f2..b8fb9b895b8df5 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/deletembcategorymessage/ViewDeleteMBCategoryMessageTest.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/deletembcategorythread/ViewDeleteMBCategoryThreadTest.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.deletembcategorymessage;
+package com.liferay.portalweb.portlet.messageboards.mbthread.deletembcategorythread;
 
 import com.liferay.portalweb.portal.BaseTestCase;
 import com.liferay.portalweb.portal.util.RuntimeVariables;
@@ -20,8 +20,8 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class ViewDeleteMBCategoryMessageTest extends BaseTestCase {
-	public void testViewDeleteMBCategoryMessage() throws Exception {
+public class ViewDeleteMBCategoryThreadTest extends BaseTestCase {
+	public void testViewDeleteMBCategoryThread() throws Exception {
 		selenium.open("/web/guest/home/");
 		loadRequiredJavaScriptModules();
 
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/editmbcategorymessagebody/EditMBCategoryMessageBodyTest.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/editmbcategorythreadbody/EditMBCategoryThreadBodyTest.html
similarity index 96%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/editmbcategorymessagebody/EditMBCategoryMessageBodyTest.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/editmbcategorythreadbody/EditMBCategoryThreadBodyTest.html
index dc37d77d05963d..8a5e00dc98f969 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/editmbcategorymessagebody/EditMBCategoryMessageBodyTest.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/editmbcategorythreadbody/EditMBCategoryThreadBodyTest.html
@@ -1,12 +1,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>EditMBCategoryMessageBodyTest</title>
+<title>EditMBCategoryThreadBodyTest</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3">EditMBCategoryMessageBodyTest</td></tr>
+<tr><td rowspan="1" colspan="3">EditMBCategoryThreadBodyTest</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/editmbcategorymessagebody/EditMBCategoryMessageBodyTest.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/editmbcategorythreadbody/EditMBCategoryThreadBodyTest.java
similarity index 96%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/editmbcategorymessagebody/EditMBCategoryMessageBodyTest.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/editmbcategorythreadbody/EditMBCategoryThreadBodyTest.java
index 545b2b9e74ae84..5fd8c2e3c5ae8c 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/editmbcategorymessagebody/EditMBCategoryMessageBodyTest.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/editmbcategorythreadbody/EditMBCategoryThreadBodyTest.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.editmbcategorymessagebody;
+package com.liferay.portalweb.portlet.messageboards.mbthread.editmbcategorythreadbody;
 
 import com.liferay.portalweb.portal.BaseTestCase;
 import com.liferay.portalweb.portal.util.RuntimeVariables;
@@ -20,8 +20,8 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class EditMBCategoryMessageBodyTest extends BaseTestCase {
-	public void testEditMBCategoryMessageBody() throws Exception {
+public class EditMBCategoryThreadBodyTest extends BaseTestCase {
+	public void testEditMBCategoryThreadBody() throws Exception {
 		selenium.open("/web/guest/home/");
 		loadRequiredJavaScriptModules();
 
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/editmbcategorythreadbody/EditMBCategoryThreadBodyTests.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/editmbcategorythreadbody/EditMBCategoryThreadBodyTests.html
new file mode 100644
index 00000000000000..09ec22ecb9ae50
--- /dev/null
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/editmbcategorythreadbody/EditMBCategoryThreadBodyTests.html
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+  <meta content="text/html; charset=UTF-8" http-equiv="content-type" />
+  <title>EditMBCategoryThreadBodyTests</title>
+</head>
+<body>
+<table id="suiteTable" cellpadding="1" cellspacing="1" border="1" class="selenium"><tbody>
+<tr><td><b>EditMBCategoryThreadBodyTests</b></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPageMBTest.html">AddPageMBTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPortletMBTest.html">AddPortletMBTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/AddMBCategoryTest.html">AddMBCategoryTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategoryThreadTest.html">PostNewMBCategoryThreadTest</a></td></tr>
+<tr><td><a href="EditMBCategoryThreadBodyTest.html">EditMBCategoryThreadBodyTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/TearDownMBCategoryTest.html">TearDownMBCategoryTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portal/util/TearDownPageTest.html">TearDownPageTest</a></td></tr>
+</tbody></table>
+</body>
+</html>
\ No newline at end of file
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/editmbcategorythreadbody/EditMBCategoryThreadBodyTests.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/editmbcategorythreadbody/EditMBCategoryThreadBodyTests.java
new file mode 100644
index 00000000000000..e965070d6714cb
--- /dev/null
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/editmbcategorythreadbody/EditMBCategoryThreadBodyTests.java
@@ -0,0 +1,44 @@
+/**
+ * Copyright (c) 2000-2012 Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package com.liferay.portalweb.portlet.messageboards.mbthread.editmbcategorythreadbody;
+
+import com.liferay.portalweb.portal.BaseTestSuite;
+import com.liferay.portalweb.portal.util.TearDownPageTest;
+import com.liferay.portalweb.portlet.messageboards.mbcategory.addmbcategory.AddMBCategoryTest;
+import com.liferay.portalweb.portlet.messageboards.mbcategory.addmbcategory.TearDownMBCategoryTest;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbcategorythread.PostNewMBCategoryThreadTest;
+import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPageMBTest;
+import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPortletMBTest;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+/**
+ * @author Brian Wing Shun Chan
+ */
+public class EditMBCategoryThreadBodyTests extends BaseTestSuite {
+	public static Test suite() {
+		TestSuite testSuite = new TestSuite();
+		testSuite.addTestSuite(AddPageMBTest.class);
+		testSuite.addTestSuite(AddPortletMBTest.class);
+		testSuite.addTestSuite(AddMBCategoryTest.class);
+		testSuite.addTestSuite(PostNewMBCategoryThreadTest.class);
+		testSuite.addTestSuite(EditMBCategoryThreadBodyTest.class);
+		testSuite.addTestSuite(TearDownMBCategoryTest.class);
+		testSuite.addTestSuite(TearDownPageTest.class);
+
+		return testSuite;
+	}
+}
\ No newline at end of file
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/editmbcategorymessagebodynull/EditMBCategoryMessageBodyNullTest.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/editmbcategorythreadbodynull/EditMBCategoryThreadBodyNullTest.html
similarity index 96%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/editmbcategorymessagebodynull/EditMBCategoryMessageBodyNullTest.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/editmbcategorythreadbodynull/EditMBCategoryThreadBodyNullTest.html
index fe20b77f97d5ed..24a692d80c9e72 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/editmbcategorymessagebodynull/EditMBCategoryMessageBodyNullTest.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/editmbcategorythreadbodynull/EditMBCategoryThreadBodyNullTest.html
@@ -1,12 +1,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>EditMBCategoryMessageBodyNullTest</title>
+<title>EditMBCategoryThreadBodyNullTest</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3">EditMBCategoryMessageBodyNullTest</td></tr>
+<tr><td rowspan="1" colspan="3">EditMBCategoryThreadBodyNullTest</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/editmbcategorymessagebodynull/EditMBCategoryMessageBodyNullTest.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/editmbcategorythreadbodynull/EditMBCategoryThreadBodyNullTest.java
similarity index 96%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/editmbcategorymessagebodynull/EditMBCategoryMessageBodyNullTest.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/editmbcategorythreadbodynull/EditMBCategoryThreadBodyNullTest.java
index 0a6f528f77cf83..e494020ac9e260 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/editmbcategorymessagebodynull/EditMBCategoryMessageBodyNullTest.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/editmbcategorythreadbodynull/EditMBCategoryThreadBodyNullTest.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.editmbcategorymessagebodynull;
+package com.liferay.portalweb.portlet.messageboards.mbthread.editmbcategorythreadbodynull;
 
 import com.liferay.portalweb.portal.BaseTestCase;
 import com.liferay.portalweb.portal.util.RuntimeVariables;
@@ -20,8 +20,8 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class EditMBCategoryMessageBodyNullTest extends BaseTestCase {
-	public void testEditMBCategoryMessageBodyNull() throws Exception {
+public class EditMBCategoryThreadBodyNullTest extends BaseTestCase {
+	public void testEditMBCategoryThreadBodyNull() throws Exception {
 		selenium.open("/web/guest/home/");
 		loadRequiredJavaScriptModules();
 
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/editmbcategorymessagebody/EditMBCategoryMessageBodyTests.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/editmbcategorythreadbodynull/EditMBCategoryThreadBodyNullTests.html
similarity index 78%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/editmbcategorymessagebody/EditMBCategoryMessageBodyTests.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/editmbcategorythreadbodynull/EditMBCategoryThreadBodyNullTests.html
index 294994ff0923ac..d5a302c4acc57c 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/editmbcategorymessagebody/EditMBCategoryMessageBodyTests.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/editmbcategorythreadbodynull/EditMBCategoryThreadBodyNullTests.html
@@ -3,16 +3,16 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
   <meta content="text/html; charset=UTF-8" http-equiv="content-type" />
-  <title>EditMBCategoryMessageBodyTests</title>
+  <title>EditMBCategoryThreadBodyNullTests</title>
 </head>
 <body>
 <table id="suiteTable" cellpadding="1" cellspacing="1" border="1" class="selenium"><tbody>
-<tr><td><b>EditMBCategoryMessageBodyTests</b></td></tr>
+<tr><td><b>EditMBCategoryThreadBodyNullTests</b></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPageMBTest.html">AddPageMBTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPortletMBTest.html">AddPortletMBTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/AddMBCategoryTest.html">AddMBCategoryTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThreadMessageTest.html">PostNewMBCategoryThreadMessageTest</a></td></tr>
-<tr><td><a href="EditMBCategoryMessageBodyTest.html">EditMBCategoryMessageBodyTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategoryThreadTest.html">PostNewMBCategoryThreadTest</a></td></tr>
+<tr><td><a href="EditMBCategoryThreadBodyNullTest.html">EditMBCategoryThreadBodyNullTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/TearDownMBCategoryTest.html">TearDownMBCategoryTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portal/util/TearDownPageTest.html">TearDownPageTest</a></td></tr>
 </tbody></table>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessage/AddMBCategoryMessageTests.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/editmbcategorythreadbodynull/EditMBCategoryThreadBodyNullTests.java
similarity index 79%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessage/AddMBCategoryMessageTests.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/editmbcategorythreadbodynull/EditMBCategoryThreadBodyNullTests.java
index 75df2cf6b3d948..2dc04ff50083f7 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessage/AddMBCategoryMessageTests.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/editmbcategorythreadbodynull/EditMBCategoryThreadBodyNullTests.java
@@ -12,13 +12,13 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.addmbcategorymessage;
+package com.liferay.portalweb.portlet.messageboards.mbthread.editmbcategorythreadbodynull;
 
 import com.liferay.portalweb.portal.BaseTestSuite;
 import com.liferay.portalweb.portal.util.TearDownPageTest;
 import com.liferay.portalweb.portlet.messageboards.mbcategory.addmbcategory.AddMBCategoryTest;
 import com.liferay.portalweb.portlet.messageboards.mbcategory.addmbcategory.TearDownMBCategoryTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbcategorythreadmessage.PostNewMBCategoryThreadMessageTest;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbcategorythread.PostNewMBCategoryThreadTest;
 import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPageMBTest;
 import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPortletMBTest;
 
@@ -28,14 +28,14 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class AddMBCategoryMessageTests extends BaseTestSuite {
+public class EditMBCategoryThreadBodyNullTests extends BaseTestSuite {
 	public static Test suite() {
 		TestSuite testSuite = new TestSuite();
 		testSuite.addTestSuite(AddPageMBTest.class);
 		testSuite.addTestSuite(AddPortletMBTest.class);
 		testSuite.addTestSuite(AddMBCategoryTest.class);
-		testSuite.addTestSuite(PostNewMBCategoryThreadMessageTest.class);
-		testSuite.addTestSuite(ViewMBCategoryMessageTest.class);
+		testSuite.addTestSuite(PostNewMBCategoryThreadTest.class);
+		testSuite.addTestSuite(EditMBCategoryThreadBodyNullTest.class);
 		testSuite.addTestSuite(TearDownMBCategoryTest.class);
 		testSuite.addTestSuite(TearDownPageTest.class);
 
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/editmbcategorymessagesubject/EditMBCategoryMessageSubjectTest.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/editmbcategorythreadsubject/EditMBCategoryThreadSubjectTest.html
similarity index 95%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/editmbcategorymessagesubject/EditMBCategoryMessageSubjectTest.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/editmbcategorythreadsubject/EditMBCategoryThreadSubjectTest.html
index 52cfc1310d8f86..f29a6927378e8e 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/editmbcategorymessagesubject/EditMBCategoryMessageSubjectTest.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/editmbcategorythreadsubject/EditMBCategoryThreadSubjectTest.html
@@ -1,12 +1,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>EditMBCategoryMessageSubjectTest</title>
+<title>EditMBCategoryThreadSubjectTest</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3">EditMBCategoryMessageSubjectTest</td></tr>
+<tr><td rowspan="1" colspan="3">EditMBCategoryThreadSubjectTest</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/editmbcategorymessagesubject/EditMBCategoryMessageSubjectTest.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/editmbcategorythreadsubject/EditMBCategoryThreadSubjectTest.java
similarity index 95%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/editmbcategorymessagesubject/EditMBCategoryMessageSubjectTest.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/editmbcategorythreadsubject/EditMBCategoryThreadSubjectTest.java
index 62ca629bfd9ca8..027dff25e2c200 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/editmbcategorymessagesubject/EditMBCategoryMessageSubjectTest.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/editmbcategorythreadsubject/EditMBCategoryThreadSubjectTest.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.editmbcategorymessagesubject;
+package com.liferay.portalweb.portlet.messageboards.mbthread.editmbcategorythreadsubject;
 
 import com.liferay.portalweb.portal.BaseTestCase;
 import com.liferay.portalweb.portal.util.RuntimeVariables;
@@ -20,8 +20,8 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class EditMBCategoryMessageSubjectTest extends BaseTestCase {
-	public void testEditMBCategoryMessageSubject() throws Exception {
+public class EditMBCategoryThreadSubjectTest extends BaseTestCase {
+	public void testEditMBCategoryThreadSubject() throws Exception {
 		selenium.open("/web/guest/home/");
 		loadRequiredJavaScriptModules();
 
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbsubcategorymessagebodynull/AddMBSubcategoryMessageBodyNullTests.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/editmbcategorythreadsubject/EditMBCategoryThreadSubjectTests.html
similarity index 78%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbsubcategorymessagebodynull/AddMBSubcategoryMessageBodyNullTests.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/editmbcategorythreadsubject/EditMBCategoryThreadSubjectTests.html
index f5f2d072b152d9..39829ae37072ac 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbsubcategorymessagebodynull/AddMBSubcategoryMessageBodyNullTests.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/editmbcategorythreadsubject/EditMBCategoryThreadSubjectTests.html
@@ -3,16 +3,16 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
   <meta content="text/html; charset=UTF-8" http-equiv="content-type" />
-  <title>AddMBSubcategoryMessageBodyNullTests</title>
+  <title>EditMBCategoryThreadSubjectTests</title>
 </head>
 <body>
 <table id="suiteTable" cellpadding="1" cellspacing="1" border="1" class="selenium"><tbody>
-<tr><td><b>AddMBSubcategoryMessageBodyNullTests</b></td></tr>
+<tr><td><b>EditMBCategoryThreadSubjectTests</b></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPageMBTest.html">AddPageMBTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPortletMBTest.html">AddPortletMBTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/AddMBCategoryTest.html">AddMBCategoryTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/addmbsubcategorymessage/AddMBSubcategoryTest.html">AddMBSubcategoryTest</a></td></tr>
-<tr><td><a href="AddMBSubcategoryMessageBodyNullTest.html">AddMBSubcategoryMessageBodyNullTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategoryThreadTest.html">PostNewMBCategoryThreadTest</a></td></tr>
+<tr><td><a href="EditMBCategoryThreadSubjectTest.html">EditMBCategoryThreadSubjectTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/TearDownMBCategoryTest.html">TearDownMBCategoryTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portal/util/TearDownPageTest.html">TearDownPageTest</a></td></tr>
 </tbody></table>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/editmbcategorythreadsubject/EditMBCategoryThreadSubjectTests.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/editmbcategorythreadsubject/EditMBCategoryThreadSubjectTests.java
new file mode 100644
index 00000000000000..327b13f293635d
--- /dev/null
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/editmbcategorythreadsubject/EditMBCategoryThreadSubjectTests.java
@@ -0,0 +1,44 @@
+/**
+ * Copyright (c) 2000-2012 Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package com.liferay.portalweb.portlet.messageboards.mbthread.editmbcategorythreadsubject;
+
+import com.liferay.portalweb.portal.BaseTestSuite;
+import com.liferay.portalweb.portal.util.TearDownPageTest;
+import com.liferay.portalweb.portlet.messageboards.mbcategory.addmbcategory.AddMBCategoryTest;
+import com.liferay.portalweb.portlet.messageboards.mbcategory.addmbcategory.TearDownMBCategoryTest;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbcategorythread.PostNewMBCategoryThreadTest;
+import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPageMBTest;
+import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPortletMBTest;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+/**
+ * @author Brian Wing Shun Chan
+ */
+public class EditMBCategoryThreadSubjectTests extends BaseTestSuite {
+	public static Test suite() {
+		TestSuite testSuite = new TestSuite();
+		testSuite.addTestSuite(AddPageMBTest.class);
+		testSuite.addTestSuite(AddPortletMBTest.class);
+		testSuite.addTestSuite(AddMBCategoryTest.class);
+		testSuite.addTestSuite(PostNewMBCategoryThreadTest.class);
+		testSuite.addTestSuite(EditMBCategoryThreadSubjectTest.class);
+		testSuite.addTestSuite(TearDownMBCategoryTest.class);
+		testSuite.addTestSuite(TearDownPageTest.class);
+
+		return testSuite;
+	}
+}
\ No newline at end of file
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/editmbcategorymessagesubjectnull/EditMBCategoryMessageSubjectNullTest.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/editmbcategorythreadsubjectnull/EditMBCategoryThreadSubjectNullTest.html
similarity index 94%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/editmbcategorymessagesubjectnull/EditMBCategoryMessageSubjectNullTest.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/editmbcategorythreadsubjectnull/EditMBCategoryThreadSubjectNullTest.html
index 998afd46105e2c..2624763a62756c 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/editmbcategorymessagesubjectnull/EditMBCategoryMessageSubjectNullTest.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/editmbcategorythreadsubjectnull/EditMBCategoryThreadSubjectNullTest.html
@@ -1,12 +1,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>EditMBCategoryMessageSubjectNullTest</title>
+<title>EditMBCategoryThreadSubjectNullTest</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3">EditMBCategoryMessageSubjectNullTest</td></tr>
+<tr><td rowspan="1" colspan="3">EditMBCategoryThreadSubjectNullTest</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/editmbcategorymessagesubjectnull/EditMBCategoryMessageSubjectNullTest.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/editmbcategorythreadsubjectnull/EditMBCategoryThreadSubjectNullTest.java
similarity index 94%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/editmbcategorymessagesubjectnull/EditMBCategoryMessageSubjectNullTest.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/editmbcategorythreadsubjectnull/EditMBCategoryThreadSubjectNullTest.java
index dee7893ce3d232..75bfd2a4dc4427 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/editmbcategorymessagesubjectnull/EditMBCategoryMessageSubjectNullTest.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/editmbcategorythreadsubjectnull/EditMBCategoryThreadSubjectNullTest.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.editmbcategorymessagesubjectnull;
+package com.liferay.portalweb.portlet.messageboards.mbthread.editmbcategorythreadsubjectnull;
 
 import com.liferay.portalweb.portal.BaseTestCase;
 import com.liferay.portalweb.portal.util.RuntimeVariables;
@@ -20,9 +20,8 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class EditMBCategoryMessageSubjectNullTest extends BaseTestCase {
-	public void testEditMBCategoryMessageSubjectNull()
-		throws Exception {
+public class EditMBCategoryThreadSubjectNullTest extends BaseTestCase {
+	public void testEditMBCategoryThreadSubjectNull() throws Exception {
 		selenium.open("/web/guest/home/");
 		loadRequiredJavaScriptModules();
 
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/editmbcategorythreadsubjectnull/EditMBCategoryThreadSubjectNullTests.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/editmbcategorythreadsubjectnull/EditMBCategoryThreadSubjectNullTests.html
new file mode 100644
index 00000000000000..33b1ca81ff9867
--- /dev/null
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/editmbcategorythreadsubjectnull/EditMBCategoryThreadSubjectNullTests.html
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+  <meta content="text/html; charset=UTF-8" http-equiv="content-type" />
+  <title>EditMBCategoryThreadSubjectNullTests</title>
+</head>
+<body>
+<table id="suiteTable" cellpadding="1" cellspacing="1" border="1" class="selenium"><tbody>
+<tr><td><b>EditMBCategoryThreadSubjectNullTests</b></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPageMBTest.html">AddPageMBTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPortletMBTest.html">AddPortletMBTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/AddMBCategoryTest.html">AddMBCategoryTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategoryThreadTest.html">PostNewMBCategoryThreadTest</a></td></tr>
+<tr><td><a href="EditMBCategoryThreadSubjectNullTest.html">EditMBCategoryThreadSubjectNullTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/TearDownMBCategoryTest.html">TearDownMBCategoryTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portal/util/TearDownPageTest.html">TearDownPageTest</a></td></tr>
+</tbody></table>
+</body>
+</html>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/editmbcategorythreadsubjectnull/EditMBCategoryThreadSubjectNullTests.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/editmbcategorythreadsubjectnull/EditMBCategoryThreadSubjectNullTests.java
new file mode 100644
index 00000000000000..9efb57bddfba54
--- /dev/null
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/editmbcategorythreadsubjectnull/EditMBCategoryThreadSubjectNullTests.java
@@ -0,0 +1,44 @@
+/**
+ * Copyright (c) 2000-2012 Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package com.liferay.portalweb.portlet.messageboards.mbthread.editmbcategorythreadsubjectnull;
+
+import com.liferay.portalweb.portal.BaseTestSuite;
+import com.liferay.portalweb.portal.util.TearDownPageTest;
+import com.liferay.portalweb.portlet.messageboards.mbcategory.addmbcategory.AddMBCategoryTest;
+import com.liferay.portalweb.portlet.messageboards.mbcategory.addmbcategory.TearDownMBCategoryTest;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbcategorythread.PostNewMBCategoryThreadTest;
+import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPageMBTest;
+import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPortletMBTest;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+/**
+ * @author Brian Wing Shun Chan
+ */
+public class EditMBCategoryThreadSubjectNullTests extends BaseTestSuite {
+	public static Test suite() {
+		TestSuite testSuite = new TestSuite();
+		testSuite.addTestSuite(AddPageMBTest.class);
+		testSuite.addTestSuite(AddPortletMBTest.class);
+		testSuite.addTestSuite(AddMBCategoryTest.class);
+		testSuite.addTestSuite(PostNewMBCategoryThreadTest.class);
+		testSuite.addTestSuite(EditMBCategoryThreadSubjectNullTest.class);
+		testSuite.addTestSuite(TearDownMBCategoryTest.class);
+		testSuite.addTestSuite(TearDownPageTest.class);
+
+		return testSuite;
+	}
+}
\ No newline at end of file
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/guestviewmbthreadmessageguestviewoff/Guest_ViewMBThreadMessageGuestViewOffTest.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/guestviewmbthreadguestviewoff/Guest_ViewMBThreadGuestViewOffTest.html
similarity index 82%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/guestviewmbthreadmessageguestviewoff/Guest_ViewMBThreadMessageGuestViewOffTest.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/guestviewmbthreadguestviewoff/Guest_ViewMBThreadGuestViewOffTest.html
index afc28458e15469..482a869812acb8 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/guestviewmbthreadmessageguestviewoff/Guest_ViewMBThreadMessageGuestViewOffTest.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/guestviewmbthreadguestviewoff/Guest_ViewMBThreadGuestViewOffTest.html
@@ -1,12 +1,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Guest_ViewMBThreadMessageGuestViewOffTest</title>
+<title>Guest_ViewMBThreadGuestViewOffTest</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3">Guest_ViewMBThreadMessageGuestViewOffTest</td></tr>
+<tr><td rowspan="1" colspan="3">Guest_ViewMBThreadGuestViewOffTest</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/guestviewmbthreadmessageguestviewoff/Guest_ViewMBThreadMessageGuestViewOffTest.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/guestviewmbthreadguestviewoff/Guest_ViewMBThreadGuestViewOffTest.java
similarity index 84%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/guestviewmbthreadmessageguestviewoff/Guest_ViewMBThreadMessageGuestViewOffTest.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/guestviewmbthreadguestviewoff/Guest_ViewMBThreadGuestViewOffTest.java
index b8a4daadcb09a4..a3827a5a8f5847 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/guestviewmbthreadmessageguestviewoff/Guest_ViewMBThreadMessageGuestViewOffTest.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/guestviewmbthreadguestviewoff/Guest_ViewMBThreadGuestViewOffTest.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.guestviewmbthreadmessageguestviewoff;
+package com.liferay.portalweb.portlet.messageboards.mbthread.guestviewmbthreadguestviewoff;
 
 import com.liferay.portalweb.portal.BaseTestCase;
 import com.liferay.portalweb.portal.util.RuntimeVariables;
@@ -20,9 +20,8 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class Guest_ViewMBThreadMessageGuestViewOffTest extends BaseTestCase {
-	public void testGuest_ViewMBThreadMessageGuestViewOff()
-		throws Exception {
+public class Guest_ViewMBThreadGuestViewOffTest extends BaseTestCase {
+	public void testGuest_ViewMBThreadGuestViewOff() throws Exception {
 		selenium.open("/web/guest/home/");
 		loadRequiredJavaScriptModules();
 
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/guestviewmbthreadmessageguestviewoff/Guest_ViewMBThreadMessageGuestViewOffTests.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/guestviewmbthreadguestviewoff/Guest_ViewMBThreadGuestViewOffTests.html
similarity index 67%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/guestviewmbthreadmessageguestviewoff/Guest_ViewMBThreadMessageGuestViewOffTests.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/guestviewmbthreadguestviewoff/Guest_ViewMBThreadGuestViewOffTests.html
index 5f2b5d98f885bf..9f80c4448e4529 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/guestviewmbthreadmessageguestviewoff/Guest_ViewMBThreadMessageGuestViewOffTests.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/guestviewmbthreadguestviewoff/Guest_ViewMBThreadGuestViewOffTests.html
@@ -3,22 +3,22 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
   <meta content="text/html; charset=UTF-8" http-equiv="content-type" />
-  <title>Guest_ViewMBThreadMessageGuestViewOffTests</title>
+  <title>Guest_ViewMBThreadGuestViewOffTests</title>
 </head>
 <body>
 <table id="suiteTable" cellpadding="1" cellspacing="1" border="1" class="selenium"><tbody>
-<tr><td><b>Guest_ViewMBThreadMessageGuestViewOffTests</b></td></tr>
+<tr><td><b>Guest_ViewMBThreadGuestViewOffTests</b></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPageMBTest.html">AddPageMBTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPortletMBTest.html">AddPortletMBTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/postnewmbthreadmessage/PostNewMBThreadMessageTest.html">PostNewMBThreadMessageTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/postnewmbthread/PostNewMBThreadTest.html">PostNewMBThreadTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portal/controlpanel/users/user/signin/SignOutTest.html">SignOutTest</a></td></tr>
-<tr><td><a href="Guest_ViewMBThreadMessageTest.html">Guest_ViewMBThreadMessageTest</a></td></tr>
+<tr><td><a href="Guest_ViewMBThreadTest.html">Guest_ViewMBThreadTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portal/controlpanel/users/user/signin/SignInTest.html">SignInTest</a></td></tr>
-<tr><td><a href="PermissionsMBThreadMessageGuestViewOffTest.html">PermissionsMBThreadMessageGuestViewOffTest</a></td></tr>
+<tr><td><a href="PermissionsMBThreadGuestViewOffTest.html">PermissionsMBThreadGuestViewOffTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portal/controlpanel/users/user/signin/SignOutTest.html">SignOutTest</a></td></tr>
-<tr><td><a href="Guest_ViewMBThreadMessageGuestViewOffTest.html">Guest_ViewMBThreadMessageGuestViewOffTest</a></td></tr>
+<tr><td><a href="Guest_ViewMBThreadGuestViewOffTest.html">Guest_ViewMBThreadGuestViewOffTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portal/controlpanel/users/user/signin/SignInTest.html">SignInTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/postnewmbthreadmessage/TearDownMBThreadMessageTest.html">TearDownMBThreadMessageTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/postnewmbthread/TearDownMBThreadTest.html">TearDownMBThreadTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portal/util/TearDownPageTest.html">TearDownPageTest</a></td></tr>
 </tbody></table>
 </body>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/guestviewmbthreadmessageguestviewoff/Guest_ViewMBThreadMessageGuestViewOffTests.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/guestviewmbthreadguestviewoff/Guest_ViewMBThreadGuestViewOffTests.java
similarity index 67%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/guestviewmbthreadmessageguestviewoff/Guest_ViewMBThreadMessageGuestViewOffTests.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/guestviewmbthreadguestviewoff/Guest_ViewMBThreadGuestViewOffTests.java
index 2c7ea4dd0b7e64..bf25e3e84645c1 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/guestviewmbthreadmessageguestviewoff/Guest_ViewMBThreadMessageGuestViewOffTests.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/guestviewmbthreadguestviewoff/Guest_ViewMBThreadGuestViewOffTests.java
@@ -12,14 +12,14 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.guestviewmbthreadmessageguestviewoff;
+package com.liferay.portalweb.portlet.messageboards.mbthread.guestviewmbthreadguestviewoff;
 
 import com.liferay.portalweb.portal.BaseTestSuite;
 import com.liferay.portalweb.portal.controlpanel.users.user.signin.SignInTest;
 import com.liferay.portalweb.portal.controlpanel.users.user.signin.SignOutTest;
 import com.liferay.portalweb.portal.util.TearDownPageTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbthreadmessage.PostNewMBThreadMessageTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbthreadmessage.TearDownMBThreadMessageTest;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbthread.PostNewMBThreadTest;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbthread.TearDownMBThreadTest;
 import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPageMBTest;
 import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPortletMBTest;
 
@@ -29,20 +29,20 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class Guest_ViewMBThreadMessageGuestViewOffTests extends BaseTestSuite {
+public class Guest_ViewMBThreadGuestViewOffTests extends BaseTestSuite {
 	public static Test suite() {
 		TestSuite testSuite = new TestSuite();
 		testSuite.addTestSuite(AddPageMBTest.class);
 		testSuite.addTestSuite(AddPortletMBTest.class);
-		testSuite.addTestSuite(PostNewMBThreadMessageTest.class);
+		testSuite.addTestSuite(PostNewMBThreadTest.class);
 		testSuite.addTestSuite(SignOutTest.class);
-		testSuite.addTestSuite(Guest_ViewMBThreadMessageTest.class);
+		testSuite.addTestSuite(Guest_ViewMBThreadTest.class);
 		testSuite.addTestSuite(SignInTest.class);
-		testSuite.addTestSuite(PermissionsMBThreadMessageGuestViewOffTest.class);
+		testSuite.addTestSuite(PermissionsMBThreadGuestViewOffTest.class);
 		testSuite.addTestSuite(SignOutTest.class);
-		testSuite.addTestSuite(Guest_ViewMBThreadMessageGuestViewOffTest.class);
+		testSuite.addTestSuite(Guest_ViewMBThreadGuestViewOffTest.class);
 		testSuite.addTestSuite(SignInTest.class);
-		testSuite.addTestSuite(TearDownMBThreadMessageTest.class);
+		testSuite.addTestSuite(TearDownMBThreadTest.class);
 		testSuite.addTestSuite(TearDownPageTest.class);
 
 		return testSuite;
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/guestviewmbthreadmessageguestviewoff/Guest_ViewMBThreadMessageTest.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/guestviewmbthreadguestviewoff/Guest_ViewMBThreadTest.html
similarity index 92%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/guestviewmbthreadmessageguestviewoff/Guest_ViewMBThreadMessageTest.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/guestviewmbthreadguestviewoff/Guest_ViewMBThreadTest.html
index d6951afaec9b66..0c885249b97070 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/guestviewmbthreadmessageguestviewoff/Guest_ViewMBThreadMessageTest.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/guestviewmbthreadguestviewoff/Guest_ViewMBThreadTest.html
@@ -1,12 +1,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Guest_ViewMBThreadMessageTest</title>
+<title>Guest_ViewMBThreadTest</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3">Guest_ViewMBThreadMessageTest</td></tr>
+<tr><td rowspan="1" colspan="3">Guest_ViewMBThreadTest</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/guestviewmbthreadmessageguestviewoff/Guest_ViewMBThreadMessageTest.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/guestviewmbthreadguestviewoff/Guest_ViewMBThreadTest.java
similarity index 91%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/guestviewmbthreadmessageguestviewoff/Guest_ViewMBThreadMessageTest.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/guestviewmbthreadguestviewoff/Guest_ViewMBThreadTest.java
index 94187f4df10f7f..eb15a549cead45 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/guestviewmbthreadmessageguestviewoff/Guest_ViewMBThreadMessageTest.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/guestviewmbthreadguestviewoff/Guest_ViewMBThreadTest.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.guestviewmbthreadmessageguestviewoff;
+package com.liferay.portalweb.portlet.messageboards.mbthread.guestviewmbthreadguestviewoff;
 
 import com.liferay.portalweb.portal.BaseTestCase;
 import com.liferay.portalweb.portal.util.RuntimeVariables;
@@ -20,8 +20,8 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class Guest_ViewMBThreadMessageTest extends BaseTestCase {
-	public void testGuest_ViewMBThreadMessage() throws Exception {
+public class Guest_ViewMBThreadTest extends BaseTestCase {
+	public void testGuest_ViewMBThread() throws Exception {
 		selenium.open("/web/guest/home/");
 		loadRequiredJavaScriptModules();
 
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/guestviewmbthreadmessageguestviewoff/PermissionsMBThreadMessageGuestViewOffTest.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/guestviewmbthreadguestviewoff/PermissionsMBThreadGuestViewOffTest.html
similarity index 91%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/guestviewmbthreadmessageguestviewoff/PermissionsMBThreadMessageGuestViewOffTest.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/guestviewmbthreadguestviewoff/PermissionsMBThreadGuestViewOffTest.html
index 667fd4b2a8a0dc..738928c7140b47 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/guestviewmbthreadmessageguestviewoff/PermissionsMBThreadMessageGuestViewOffTest.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/guestviewmbthreadguestviewoff/PermissionsMBThreadGuestViewOffTest.html
@@ -1,12 +1,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>PermissionsMBThreadMessageGuestViewOffTest</title>
+<title>PermissionsMBThreadGuestViewOffTest</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3">PermissionsMBThreadMessageGuestViewOffTest</td></tr>
+<tr><td rowspan="1" colspan="3">PermissionsMBThreadGuestViewOffTest</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/guestviewmbthreadmessageguestviewoff/PermissionsMBThreadMessageGuestViewOffTest.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/guestviewmbthreadguestviewoff/PermissionsMBThreadGuestViewOffTest.java
similarity index 90%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/guestviewmbthreadmessageguestviewoff/PermissionsMBThreadMessageGuestViewOffTest.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/guestviewmbthreadguestviewoff/PermissionsMBThreadGuestViewOffTest.java
index 195421c3498096..84b3c84f26f13c 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/guestviewmbthreadmessageguestviewoff/PermissionsMBThreadMessageGuestViewOffTest.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/guestviewmbthreadguestviewoff/PermissionsMBThreadGuestViewOffTest.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.guestviewmbthreadmessageguestviewoff;
+package com.liferay.portalweb.portlet.messageboards.mbthread.guestviewmbthreadguestviewoff;
 
 import com.liferay.portalweb.portal.BaseTestCase;
 import com.liferay.portalweb.portal.util.RuntimeVariables;
@@ -20,9 +20,8 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class PermissionsMBThreadMessageGuestViewOffTest extends BaseTestCase {
-	public void testPermissionsMBThreadMessageGuestViewOff()
-		throws Exception {
+public class PermissionsMBThreadGuestViewOffTest extends BaseTestCase {
+	public void testPermissionsMBThreadGuestViewOff() throws Exception {
 		selenium.open("/web/guest/home/");
 		loadRequiredJavaScriptModules();
 
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/deletemarkasanswermbcategorymessagereply/MarkAsAnswerMBCategoryMessageQuestionReplyTest.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/markasanswermbcategorythreadquestionreply/MarkAsAnswerMBCategoryThreadQuestionReplyTest.html
similarity index 93%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/deletemarkasanswermbcategorymessagereply/MarkAsAnswerMBCategoryMessageQuestionReplyTest.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/markasanswermbcategorythreadquestionreply/MarkAsAnswerMBCategoryThreadQuestionReplyTest.html
index 0971f8824c6d6d..b2f2e64fce1518 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/deletemarkasanswermbcategorymessagereply/MarkAsAnswerMBCategoryMessageQuestionReplyTest.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/markasanswermbcategorythreadquestionreply/MarkAsAnswerMBCategoryThreadQuestionReplyTest.html
@@ -1,12 +1,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>MarkAsAnswerMBCategoryMessageQuestionReplyTest</title>
+<title>MarkAsAnswerMBCategoryThreadQuestionReplyTest</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3">MarkAsAnswerMBCategoryMessageQuestionReplyTest</td></tr>
+<tr><td rowspan="1" colspan="3">MarkAsAnswerMBCategoryThreadQuestionReplyTest</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
@@ -118,7 +118,6 @@
 	<td>//td[2]/a</td>
 	<td>Waiting for an Answer</td>
 </tr>
-
 </tbody></table>
 </body>
 </html>
\ No newline at end of file
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/unmarkmbcategorymessagequestionreply/MarkAsAnswerMBCategoryMessageQuestionReplyTest.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/markasanswermbcategorythreadquestionreply/MarkAsAnswerMBCategoryThreadQuestionReplyTest.java
similarity index 94%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/unmarkmbcategorymessagequestionreply/MarkAsAnswerMBCategoryMessageQuestionReplyTest.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/markasanswermbcategorythreadquestionreply/MarkAsAnswerMBCategoryThreadQuestionReplyTest.java
index 6377b9ef19af29..8c7cbbf9a6202a 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/unmarkmbcategorymessagequestionreply/MarkAsAnswerMBCategoryMessageQuestionReplyTest.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/markasanswermbcategorythreadquestionreply/MarkAsAnswerMBCategoryThreadQuestionReplyTest.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.unmarkmbcategorymessagequestionreply;
+package com.liferay.portalweb.portlet.messageboards.mbthread.markasanswermbcategorythreadquestionreply;
 
 import com.liferay.portalweb.portal.BaseTestCase;
 import com.liferay.portalweb.portal.util.RuntimeVariables;
@@ -20,8 +20,8 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class MarkAsAnswerMBCategoryMessageQuestionReplyTest extends BaseTestCase {
-	public void testMarkAsAnswerMBCategoryMessageQuestionReply()
+public class MarkAsAnswerMBCategoryThreadQuestionReplyTest extends BaseTestCase {
+	public void testMarkAsAnswerMBCategoryThreadQuestionReply()
 		throws Exception {
 		selenium.open("/web/guest/home/");
 		loadRequiredJavaScriptModules();
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/splitthreadmbcategorymessagereplybackbutton/SplitThreadMBCategoryMessageReplyBackButtonTests.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/markasanswermbcategorythreadquestionreply/MarkAsAnswerMBCategoryThreadQuestionReplyTests.html
similarity index 76%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/splitthreadmbcategorymessagereplybackbutton/SplitThreadMBCategoryMessageReplyBackButtonTests.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/markasanswermbcategorythreadquestionreply/MarkAsAnswerMBCategoryThreadQuestionReplyTests.html
index f6dbe750f8df22..b9c07156ce0423 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/splitthreadmbcategorymessagereplybackbutton/SplitThreadMBCategoryMessageReplyBackButtonTests.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/markasanswermbcategorythreadquestionreply/MarkAsAnswerMBCategoryThreadQuestionReplyTests.html
@@ -11,9 +11,9 @@
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPageMBTest.html">AddPageMBTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPortletMBTest.html">AddPortletMBTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/AddMBCategoryTest.html">AddMBCategoryTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThreadMessageTest.html">PostNewMBCategoryThreadMessageTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/replymbcategorythreadmessagereply/ReplyMBCategoryThreadMessageReplyTest.html">ReplyMBCategoryThreadMessageReplyTest</a></td></tr>
-<tr><td><a href="SplitThreadMBCategoryMessageReplyBackButtonTest.html">SplitThreadMBCategoryMessageReplyBackButtonTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/postnewmbcategorythreadquestion/PostNewMBCategoryThreadQuestionTest.html">PostNewMBCategoryThreadQuestionTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/replymbcategorythreadquestionreply/ReplyMBCategoryThreadQuestionReplyTest.html">ReplyMBCategoryThreadQuestionReplyTest</a></td></tr>
+<tr><td><a href="MarkAsAnswerMBCategoryThreadQuestionReplyTest.html">MarkAsAnswerMBCategoryThreadQuestionReplyTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/TearDownMBCategoryTest.html">TearDownMBCategoryTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portal/util/TearDownPageTest.html">TearDownPageTest</a></td></tr>
 </tbody></table>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/splitthreadmbcategorymessagereplybackbutton/SplitThreadMBCategoryMessageReplyBackButtonTests.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/markasanswermbcategorythreadquestionreply/MarkAsAnswerMBCategoryThreadQuestionReplyTests.java
similarity index 70%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/splitthreadmbcategorymessagereplybackbutton/SplitThreadMBCategoryMessageReplyBackButtonTests.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/markasanswermbcategorythreadquestionreply/MarkAsAnswerMBCategoryThreadQuestionReplyTests.java
index a0689eab70a0c8..b320845bcf541e 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/splitthreadmbcategorymessagereplybackbutton/SplitThreadMBCategoryMessageReplyBackButtonTests.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/markasanswermbcategorythreadquestionreply/MarkAsAnswerMBCategoryThreadQuestionReplyTests.java
@@ -12,14 +12,14 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.splitthreadmbcategorymessagereplybackbutton;
+package com.liferay.portalweb.portlet.messageboards.mbthread.markasanswermbcategorythreadquestionreply;
 
 import com.liferay.portalweb.portal.BaseTestSuite;
 import com.liferay.portalweb.portal.util.TearDownPageTest;
 import com.liferay.portalweb.portlet.messageboards.mbcategory.addmbcategory.AddMBCategoryTest;
 import com.liferay.portalweb.portlet.messageboards.mbcategory.addmbcategory.TearDownMBCategoryTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbcategorythreadmessage.PostNewMBCategoryThreadMessageTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.replymbcategorythreadmessagereply.ReplyMBCategoryThreadMessageReplyTest;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbcategorythreadquestion.PostNewMBCategoryThreadQuestionTest;
+import com.liferay.portalweb.portlet.messageboards.mbthread.replymbcategorythreadquestionreply.ReplyMBCategoryThreadQuestionReplyTest;
 import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPageMBTest;
 import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPortletMBTest;
 
@@ -29,16 +29,16 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class SplitThreadMBCategoryMessageReplyBackButtonTests
+public class MarkAsAnswerMBCategoryThreadQuestionReplyTests
 	extends BaseTestSuite {
 	public static Test suite() {
 		TestSuite testSuite = new TestSuite();
 		testSuite.addTestSuite(AddPageMBTest.class);
 		testSuite.addTestSuite(AddPortletMBTest.class);
 		testSuite.addTestSuite(AddMBCategoryTest.class);
-		testSuite.addTestSuite(PostNewMBCategoryThreadMessageTest.class);
-		testSuite.addTestSuite(ReplyMBCategoryThreadMessageReplyTest.class);
-		testSuite.addTestSuite(SplitThreadMBCategoryMessageReplyBackButtonTest.class);
+		testSuite.addTestSuite(PostNewMBCategoryThreadQuestionTest.class);
+		testSuite.addTestSuite(ReplyMBCategoryThreadQuestionReplyTest.class);
+		testSuite.addTestSuite(MarkAsAnswerMBCategoryThreadQuestionReplyTest.class);
 		testSuite.addTestSuite(TearDownMBCategoryTest.class);
 		testSuite.addTestSuite(TearDownPageTest.class);
 
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/movembcategorymessagetocategory/MoveMBCategoryMessageToCategoryTest.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/movembcategorythreadtocategory/MoveMBCategoryThreadToCategoryTest.html
similarity index 96%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/movembcategorymessagetocategory/MoveMBCategoryMessageToCategoryTest.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/movembcategorythreadtocategory/MoveMBCategoryThreadToCategoryTest.html
index 712200698c0dea..8704f974b7a527 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/movembcategorymessagetocategory/MoveMBCategoryMessageToCategoryTest.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/movembcategorythreadtocategory/MoveMBCategoryThreadToCategoryTest.html
@@ -1,12 +1,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>MoveMBCategoryMessageToCategoryTest</title>
+<title>MoveMBCategoryThreadToCategoryTest</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3">MoveMBCategoryMessageToCategoryTest</td></tr>
+<tr><td rowspan="1" colspan="3">MoveMBCategoryThreadToCategoryTest</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/movembcategorymessagetocategory/MoveMBCategoryMessageToCategoryTest.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/movembcategorythreadtocategory/MoveMBCategoryThreadToCategoryTest.java
similarity index 95%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/movembcategorymessagetocategory/MoveMBCategoryMessageToCategoryTest.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/movembcategorythreadtocategory/MoveMBCategoryThreadToCategoryTest.java
index b0246fb58dcc11..9d95a5cce3dc45 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/movembcategorymessagetocategory/MoveMBCategoryMessageToCategoryTest.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/movembcategorythreadtocategory/MoveMBCategoryThreadToCategoryTest.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.movembcategorymessagetocategory;
+package com.liferay.portalweb.portlet.messageboards.mbthread.movembcategorythreadtocategory;
 
 import com.liferay.portalweb.portal.BaseTestCase;
 import com.liferay.portalweb.portal.util.RuntimeVariables;
@@ -20,8 +20,8 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class MoveMBCategoryMessageToCategoryTest extends BaseTestCase {
-	public void testMoveMBCategoryMessageToCategory() throws Exception {
+public class MoveMBCategoryThreadToCategoryTest extends BaseTestCase {
+	public void testMoveMBCategoryThreadToCategory() throws Exception {
 		selenium.open("/web/guest/home/");
 		loadRequiredJavaScriptModules();
 
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/movembcategorymessagetocategory/MoveMBCategoryMessageToCategoryTests.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/movembcategorythreadtocategory/MoveMBCategoryThreadToCategoryTests.html
similarity index 78%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/movembcategorymessagetocategory/MoveMBCategoryMessageToCategoryTests.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/movembcategorythreadtocategory/MoveMBCategoryThreadToCategoryTests.html
index 7e887c02c5c289..94b54c4daf28de 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/movembcategorymessagetocategory/MoveMBCategoryMessageToCategoryTests.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/movembcategorythreadtocategory/MoveMBCategoryThreadToCategoryTests.html
@@ -3,17 +3,17 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
   <meta content="text/html; charset=UTF-8" http-equiv="content-type" />
-  <title>MoveMBCategoryMessageToCategoryTests</title>
+  <title>MoveMBCategoryThreadToCategoryTests</title>
 </head>
 <body>
 <table id="suiteTable" cellpadding="1" cellspacing="1" border="1" class="selenium"><tbody>
-<tr><td><b>MoveMBCategoryMessageToCategoryTests</b></td></tr>
+<tr><td><b>MoveMBCategoryThreadToCategoryTests</b></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPageMBTest.html">AddPageMBTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPortletMBTest.html">AddPortletMBTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/AddMBCategory1Test.html">AddMBCategory1Test</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/AddMBCategory2Test.html">AddMBCategory2Test</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategory1ThreadMessageTest.html">PostNewMBCategory1ThreadMessageTest</a></td></tr>
-<tr><td><a href="MoveMBCategoryMessageToCategoryTest.html">MoveMBCategoryMessageToCategoryTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategory1ThreadTest.html">PostNewMBCategory1ThreadTest</a></td></tr>
+<tr><td><a href="MoveMBCategoryThreadToCategoryTest.html">MoveMBCategoryThreadToCategoryTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/TearDownMBCategoryTest.html">TearDownMBCategoryTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portal/util/TearDownPageTest.html">TearDownPageTest</a></td></tr>
 </tbody></table>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/movembcategorymessagetocategory/MoveMBCategoryMessageToCategoryTests.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/movembcategorythreadtocategory/MoveMBCategoryThreadToCategoryTests.java
similarity index 79%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/movembcategorymessagetocategory/MoveMBCategoryMessageToCategoryTests.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/movembcategorythreadtocategory/MoveMBCategoryThreadToCategoryTests.java
index e682d17db3b466..c3e380c0a85fee 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/movembcategorymessagetocategory/MoveMBCategoryMessageToCategoryTests.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/movembcategorythreadtocategory/MoveMBCategoryThreadToCategoryTests.java
@@ -12,14 +12,14 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.movembcategorymessagetocategory;
+package com.liferay.portalweb.portlet.messageboards.mbthread.movembcategorythreadtocategory;
 
 import com.liferay.portalweb.portal.BaseTestSuite;
 import com.liferay.portalweb.portal.util.TearDownPageTest;
 import com.liferay.portalweb.portlet.messageboards.mbcategory.addmbcategory.AddMBCategory1Test;
 import com.liferay.portalweb.portlet.messageboards.mbcategory.addmbcategory.AddMBCategory2Test;
 import com.liferay.portalweb.portlet.messageboards.mbcategory.addmbcategory.TearDownMBCategoryTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbcategorythreadmessage.PostNewMBCategory1ThreadMessageTest;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbcategorythread.PostNewMBCategory1ThreadTest;
 import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPageMBTest;
 import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPortletMBTest;
 
@@ -29,15 +29,15 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class MoveMBCategoryMessageToCategoryTests extends BaseTestSuite {
+public class MoveMBCategoryThreadToCategoryTests extends BaseTestSuite {
 	public static Test suite() {
 		TestSuite testSuite = new TestSuite();
 		testSuite.addTestSuite(AddPageMBTest.class);
 		testSuite.addTestSuite(AddPortletMBTest.class);
 		testSuite.addTestSuite(AddMBCategory1Test.class);
 		testSuite.addTestSuite(AddMBCategory2Test.class);
-		testSuite.addTestSuite(PostNewMBCategory1ThreadMessageTest.class);
-		testSuite.addTestSuite(MoveMBCategoryMessageToCategoryTest.class);
+		testSuite.addTestSuite(PostNewMBCategory1ThreadTest.class);
+		testSuite.addTestSuite(MoveMBCategoryThreadToCategoryTest.class);
 		testSuite.addTestSuite(TearDownMBCategoryTest.class);
 		testSuite.addTestSuite(TearDownPageTest.class);
 
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/movembcategorymessagetocategoryexplanation/MoveMBCategoryMessageToCategoryExplanationTest.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/movembcategorythreadtocategoryexplanation/MoveMBCategoryThreadToCategoryExplanationTest.html
similarity index 97%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/movembcategorymessagetocategoryexplanation/MoveMBCategoryMessageToCategoryExplanationTest.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/movembcategorythreadtocategoryexplanation/MoveMBCategoryThreadToCategoryExplanationTest.html
index 482a0ac4b7c134..d789e4278ddc0c 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/movembcategorymessagetocategoryexplanation/MoveMBCategoryMessageToCategoryExplanationTest.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/movembcategorythreadtocategoryexplanation/MoveMBCategoryThreadToCategoryExplanationTest.html
@@ -1,12 +1,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>MoveMBCategoryMessageToCategoryExplanationTest</title>
+<title>MoveMBCategoryThreadToCategoryExplanationTest</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3">MoveMBCategoryMessageToCategoryExplanationTest</td></tr>
+<tr><td rowspan="1" colspan="3">MoveMBCategoryThreadToCategoryExplanationTest</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/movembcategorymessagetocategoryexplanation/MoveMBCategoryMessageToCategoryExplanationTest.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/movembcategorythreadtocategoryexplanation/MoveMBCategoryThreadToCategoryExplanationTest.java
similarity index 97%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/movembcategorymessagetocategoryexplanation/MoveMBCategoryMessageToCategoryExplanationTest.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/movembcategorythreadtocategoryexplanation/MoveMBCategoryThreadToCategoryExplanationTest.java
index 45359ad439b3ef..d62ee9a6458e01 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/movembcategorymessagetocategoryexplanation/MoveMBCategoryMessageToCategoryExplanationTest.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/movembcategorythreadtocategoryexplanation/MoveMBCategoryThreadToCategoryExplanationTest.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.movembcategorymessagetocategoryexplanation;
+package com.liferay.portalweb.portlet.messageboards.mbthread.movembcategorythreadtocategoryexplanation;
 
 import com.liferay.portalweb.portal.BaseTestCase;
 import com.liferay.portalweb.portal.util.RuntimeVariables;
@@ -20,8 +20,8 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class MoveMBCategoryMessageToCategoryExplanationTest extends BaseTestCase {
-	public void testMoveMBCategoryMessageToCategoryExplanation()
+public class MoveMBCategoryThreadToCategoryExplanationTest extends BaseTestCase {
+	public void testMoveMBCategoryThreadToCategoryExplanation()
 		throws Exception {
 		selenium.open("/web/guest/home/");
 		loadRequiredJavaScriptModules();
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/movembcategorymessagetocategoryexplanation/MoveMBCategoryMessageToCategoryExplanationTests.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/movembcategorythreadtocategoryexplanation/MoveMBCategoryThreadToCategoryExplanationTests.html
similarity index 76%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/movembcategorymessagetocategoryexplanation/MoveMBCategoryMessageToCategoryExplanationTests.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/movembcategorythreadtocategoryexplanation/MoveMBCategoryThreadToCategoryExplanationTests.html
index 55bf3674d20e44..11e47b84f01c43 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/movembcategorymessagetocategoryexplanation/MoveMBCategoryMessageToCategoryExplanationTests.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/movembcategorythreadtocategoryexplanation/MoveMBCategoryThreadToCategoryExplanationTests.html
@@ -3,17 +3,17 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
   <meta content="text/html; charset=UTF-8" http-equiv="content-type" />
-  <title>MoveMBCategoryMessageToCategoryExplanationTests</title>
+  <title>MoveMBCategoryThreadToCategoryExplanationTests</title>
 </head>
 <body>
 <table id="suiteTable" cellpadding="1" cellspacing="1" border="1" class="selenium"><tbody>
-<tr><td><b>MoveMBCategoryMessageToCategoryExplanationTests</b></td></tr>
+<tr><td><b>MoveMBCategoryThreadToCategoryExplanationTests</b></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPageMBTest.html">AddPageMBTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPortletMBTest.html">AddPortletMBTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/AddMBCategory1Test.html">AddMBCategory1Test</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/AddMBCategory2Test.html">AddMBCategory2Test</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategory1ThreadMessageTest.html">PostNewMBCategory1ThreadMessageTest</a></td></tr>
-<tr><td><a href="MoveMBCategoryMessageToCategoryExplanationTest.html">MoveMBCategoryMessageToCategoryExplanationTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategory1ThreadTest.html">PostNewMBCategory1ThreadTest</a></td></tr>
+<tr><td><a href="MoveMBCategoryThreadToCategoryExplanationTest.html">MoveMBCategoryThreadToCategoryExplanationTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/TearDownMBCategoryTest.html">TearDownMBCategoryTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portal/util/TearDownPageTest.html">TearDownPageTest</a></td></tr>
 </tbody></table>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/movembcategorymessagetocategoryexplanation/MoveMBCategoryMessageToCategoryExplanationTests.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/movembcategorythreadtocategoryexplanation/MoveMBCategoryThreadToCategoryExplanationTests.java
similarity index 79%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/movembcategorymessagetocategoryexplanation/MoveMBCategoryMessageToCategoryExplanationTests.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/movembcategorythreadtocategoryexplanation/MoveMBCategoryThreadToCategoryExplanationTests.java
index 24a2d7b7b009f1..24452f2079218a 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/movembcategorymessagetocategoryexplanation/MoveMBCategoryMessageToCategoryExplanationTests.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/movembcategorythreadtocategoryexplanation/MoveMBCategoryThreadToCategoryExplanationTests.java
@@ -12,14 +12,14 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.movembcategorymessagetocategoryexplanation;
+package com.liferay.portalweb.portlet.messageboards.mbthread.movembcategorythreadtocategoryexplanation;
 
 import com.liferay.portalweb.portal.BaseTestSuite;
 import com.liferay.portalweb.portal.util.TearDownPageTest;
 import com.liferay.portalweb.portlet.messageboards.mbcategory.addmbcategory.AddMBCategory1Test;
 import com.liferay.portalweb.portlet.messageboards.mbcategory.addmbcategory.AddMBCategory2Test;
 import com.liferay.portalweb.portlet.messageboards.mbcategory.addmbcategory.TearDownMBCategoryTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbcategorythreadmessage.PostNewMBCategory1ThreadMessageTest;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbcategorythread.PostNewMBCategory1ThreadTest;
 import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPageMBTest;
 import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPortletMBTest;
 
@@ -29,7 +29,7 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class MoveMBCategoryMessageToCategoryExplanationTests
+public class MoveMBCategoryThreadToCategoryExplanationTests
 	extends BaseTestSuite {
 	public static Test suite() {
 		TestSuite testSuite = new TestSuite();
@@ -37,8 +37,8 @@ public static Test suite() {
 		testSuite.addTestSuite(AddPortletMBTest.class);
 		testSuite.addTestSuite(AddMBCategory1Test.class);
 		testSuite.addTestSuite(AddMBCategory2Test.class);
-		testSuite.addTestSuite(PostNewMBCategory1ThreadMessageTest.class);
-		testSuite.addTestSuite(MoveMBCategoryMessageToCategoryExplanationTest.class);
+		testSuite.addTestSuite(PostNewMBCategory1ThreadTest.class);
+		testSuite.addTestSuite(MoveMBCategoryThreadToCategoryExplanationTest.class);
 		testSuite.addTestSuite(TearDownMBCategoryTest.class);
 		testSuite.addTestSuite(TearDownPageTest.class);
 
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/nextmbcategorymessage/NextMBCategoryMessageTest.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/nextmbcategorythread/NextMBCategoryThreadTest.html
similarity index 93%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/nextmbcategorymessage/NextMBCategoryMessageTest.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/nextmbcategorythread/NextMBCategoryThreadTest.html
index 486ad2f62c0734..4b8f92fd10f101 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/nextmbcategorymessage/NextMBCategoryMessageTest.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/nextmbcategorythread/NextMBCategoryThreadTest.html
@@ -1,12 +1,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>NextMBCategoryMessageTest</title>
+<title>NextMBCategoryThreadTest</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3">NextMBCategoryMessageTest</td></tr>
+<tr><td rowspan="1" colspan="3">NextMBCategoryThreadTest</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/nextmbcategorymessage/NextMBCategoryMessageTest.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/nextmbcategorythread/NextMBCategoryThreadTest.java
similarity index 93%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/nextmbcategorymessage/NextMBCategoryMessageTest.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/nextmbcategorythread/NextMBCategoryThreadTest.java
index 2c42e6c35532dd..88750712a8092a 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/nextmbcategorymessage/NextMBCategoryMessageTest.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/nextmbcategorythread/NextMBCategoryThreadTest.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.nextmbcategorymessage;
+package com.liferay.portalweb.portlet.messageboards.mbthread.nextmbcategorythread;
 
 import com.liferay.portalweb.portal.BaseTestCase;
 import com.liferay.portalweb.portal.util.RuntimeVariables;
@@ -20,8 +20,8 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class NextMBCategoryMessageTest extends BaseTestCase {
-	public void testNextMBCategoryMessage() throws Exception {
+public class NextMBCategoryThreadTest extends BaseTestCase {
+	public void testNextMBCategoryThread() throws Exception {
 		selenium.open("/web/guest/home/");
 		loadRequiredJavaScriptModules();
 
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessagemultiple/AddMBCategoryMessageMultipleTests.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/nextmbcategorythread/NextMBCategoryThreadTests.html
similarity index 71%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessagemultiple/AddMBCategoryMessageMultipleTests.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/nextmbcategorythread/NextMBCategoryThreadTests.html
index df60f33e4b176e..15e625d8f31a67 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessagemultiple/AddMBCategoryMessageMultipleTests.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/nextmbcategorythread/NextMBCategoryThreadTests.html
@@ -3,17 +3,18 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
   <meta content="text/html; charset=UTF-8" http-equiv="content-type" />
-  <title>AddMBCategoryMessageMultipleTests</title>
+  <title>NextMBCategoryThreadTests</title>
 </head>
 <body>
 <table id="suiteTable" cellpadding="1" cellspacing="1" border="1" class="selenium"><tbody>
-<tr><td><b>AddMBCategoryMessageMultipleTests</b></td></tr>
+<tr><td><b>NextMBCategoryThreadTests</b></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPageMBTest.html">AddPageMBTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPortletMBTest.html">AddPortletMBTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/AddMBCategoryTest.html">AddMBCategoryTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThread1MessageTest.html">PostNewMBCategoryThread1MessageTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThread2MessageTest.html">PostNewMBCategoryThread2MessageTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThread3MessageTest.html">PostNewMBCategoryThread3MessageTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategoryThread1Test.html">PostNewMBCategoryThread1Test</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategoryThread2Test.html">PostNewMBCategoryThread2Test</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategoryThread3Test.html">PostNewMBCategoryThread3Test</a></td></tr>
+<tr><td><a href="NextMBCategoryThreadTest.html">NextMBCategoryThreadTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/TearDownMBCategoryTest.html">TearDownMBCategoryTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portal/util/TearDownPageTest.html">TearDownPageTest</a></td></tr>
 </tbody></table>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessagereply/AddMBCategoryMessageReplyTests.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/nextmbcategorythread/NextMBCategoryThreadTests.java
similarity index 67%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessagereply/AddMBCategoryMessageReplyTests.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/nextmbcategorythread/NextMBCategoryThreadTests.java
index 404508c99fe8dc..fb46fa0b9771a4 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessagereply/AddMBCategoryMessageReplyTests.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/nextmbcategorythread/NextMBCategoryThreadTests.java
@@ -12,13 +12,15 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.addmbcategorymessagereply;
+package com.liferay.portalweb.portlet.messageboards.mbthread.nextmbcategorythread;
 
 import com.liferay.portalweb.portal.BaseTestSuite;
 import com.liferay.portalweb.portal.util.TearDownPageTest;
 import com.liferay.portalweb.portlet.messageboards.mbcategory.addmbcategory.AddMBCategoryTest;
 import com.liferay.portalweb.portlet.messageboards.mbcategory.addmbcategory.TearDownMBCategoryTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbcategorythreadmessage.PostNewMBCategoryThreadMessageTest;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbcategorythread.PostNewMBCategoryThread1Test;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbcategorythread.PostNewMBCategoryThread2Test;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbcategorythread.PostNewMBCategoryThread3Test;
 import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPageMBTest;
 import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPortletMBTest;
 
@@ -28,15 +30,16 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class AddMBCategoryMessageReplyTests extends BaseTestSuite {
+public class NextMBCategoryThreadTests extends BaseTestSuite {
 	public static Test suite() {
 		TestSuite testSuite = new TestSuite();
 		testSuite.addTestSuite(AddPageMBTest.class);
 		testSuite.addTestSuite(AddPortletMBTest.class);
 		testSuite.addTestSuite(AddMBCategoryTest.class);
-		testSuite.addTestSuite(PostNewMBCategoryThreadMessageTest.class);
-		testSuite.addTestSuite(AddMBCategoryMessageReplyTest.class);
-		testSuite.addTestSuite(ViewMBCategoryMessageReplyTest.class);
+		testSuite.addTestSuite(PostNewMBCategoryThread1Test.class);
+		testSuite.addTestSuite(PostNewMBCategoryThread2Test.class);
+		testSuite.addTestSuite(PostNewMBCategoryThread3Test.class);
+		testSuite.addTestSuite(NextMBCategoryThreadTest.class);
 		testSuite.addTestSuite(TearDownMBCategoryTest.class);
 		testSuite.addTestSuite(TearDownPageTest.class);
 
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategoriesthreadmessage/PostNewMBCategoriesThreadMessageTests.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategoriesthread/PostNewMBCategoriesThreadTests.html
similarity index 68%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategoriesthreadmessage/PostNewMBCategoriesThreadMessageTests.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategoriesthread/PostNewMBCategoriesThreadTests.html
index b0c1d634fbea53..3879951db9072a 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategoriesthreadmessage/PostNewMBCategoriesThreadMessageTests.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategoriesthread/PostNewMBCategoriesThreadTests.html
@@ -13,14 +13,14 @@
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/AddMBCategory1Test.html">AddMBCategory1Test</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/AddMBCategory2Test.html">AddMBCategory2Test</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/AddMBCategory3Test.html">AddMBCategory3Test</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategory1ThreadMessageTest.html">PostNewMBCategory1ThreadMessageTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategory2ThreadMessageTest.html">PostNewMBCategory2ThreadMessageTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategory3ThreadMessageTest.html">PostNewMBCategory3ThreadMessageTest</a></td></tr>
-<tr><td><a href="ViewMBCategory1ThreadMessageTest.html">ViewMBCategory1ThreadMessageTest</a></td></tr>
-<tr><td><a href="ViewMBCategory2ThreadMessageTest.html">ViewMBCategory2ThreadMessageTest</a></td></tr>
-<tr><td><a href="ViewMBCategory3ThreadMessageTest.html">ViewMBCategory3ThreadMessageTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategory1ThreadTest.html">PostNewMBCategory1ThreadTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategory2ThreadTest.html">PostNewMBCategory2ThreadTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategory3ThreadTest.html">PostNewMBCategory3ThreadTest</a></td></tr>
+<tr><td><a href="ViewMBCategory1ThreadTest.html">ViewMBCategory1ThreadTest</a></td></tr>
+<tr><td><a href="ViewMBCategory2ThreadTest.html">ViewMBCategory2ThreadTest</a></td></tr>
+<tr><td><a href="ViewMBCategory3ThreadTest.html">ViewMBCategory3ThreadTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/TearDownMBCategoryTest.html">TearDownMBCategoryTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/postnewmbthreadmessage/TearDownMBThreadTest.html">TearDownMBThreadTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/postnewmbthread/TearDownMBThreadTest.html">TearDownMBThreadTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portal/util/TearDownPageTest.html">TearDownPageTest</a></td></tr>
 </tbody></table>
 </body>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategoriesthreadmessage/PostNewMBCategoriesThreadMessageTests.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategoriesthread/PostNewMBCategoriesThreadTests.java
similarity index 63%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategoriesthreadmessage/PostNewMBCategoriesThreadMessageTests.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategoriesthread/PostNewMBCategoriesThreadTests.java
index f359035489f802..881d9e158f58c1 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategoriesthreadmessage/PostNewMBCategoriesThreadMessageTests.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategoriesthread/PostNewMBCategoriesThreadTests.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbcategoriesthreadmessage;
+package com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbcategoriesthread;
 
 import com.liferay.portalweb.portal.BaseTestSuite;
 import com.liferay.portalweb.portal.util.TearDownPageTest;
@@ -20,10 +20,10 @@
 import com.liferay.portalweb.portlet.messageboards.mbcategory.addmbcategory.AddMBCategory2Test;
 import com.liferay.portalweb.portlet.messageboards.mbcategory.addmbcategory.AddMBCategory3Test;
 import com.liferay.portalweb.portlet.messageboards.mbcategory.addmbcategory.TearDownMBCategoryTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbcategorythreadmessage.PostNewMBCategory1ThreadMessageTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbcategorythreadmessage.PostNewMBCategory2ThreadMessageTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbcategorythreadmessage.PostNewMBCategory3ThreadMessageTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbthreadmessage.TearDownMBThreadTest;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbcategorythread.PostNewMBCategory1ThreadTest;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbcategorythread.PostNewMBCategory2ThreadTest;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbcategorythread.PostNewMBCategory3ThreadTest;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbthread.TearDownMBThreadTest;
 import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPageMBTest;
 import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPortletMBTest;
 
@@ -33,7 +33,7 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class PostNewMBCategoriesThreadMessageTests extends BaseTestSuite {
+public class PostNewMBCategoriesThreadTests extends BaseTestSuite {
 	public static Test suite() {
 		TestSuite testSuite = new TestSuite();
 		testSuite.addTestSuite(AddPageMBTest.class);
@@ -41,12 +41,12 @@ public static Test suite() {
 		testSuite.addTestSuite(AddMBCategory1Test.class);
 		testSuite.addTestSuite(AddMBCategory2Test.class);
 		testSuite.addTestSuite(AddMBCategory3Test.class);
-		testSuite.addTestSuite(PostNewMBCategory1ThreadMessageTest.class);
-		testSuite.addTestSuite(PostNewMBCategory2ThreadMessageTest.class);
-		testSuite.addTestSuite(PostNewMBCategory3ThreadMessageTest.class);
-		testSuite.addTestSuite(ViewMBCategory1ThreadMessageTest.class);
-		testSuite.addTestSuite(ViewMBCategory2ThreadMessageTest.class);
-		testSuite.addTestSuite(ViewMBCategory3ThreadMessageTest.class);
+		testSuite.addTestSuite(PostNewMBCategory1ThreadTest.class);
+		testSuite.addTestSuite(PostNewMBCategory2ThreadTest.class);
+		testSuite.addTestSuite(PostNewMBCategory3ThreadTest.class);
+		testSuite.addTestSuite(ViewMBCategory1ThreadTest.class);
+		testSuite.addTestSuite(ViewMBCategory2ThreadTest.class);
+		testSuite.addTestSuite(ViewMBCategory3ThreadTest.class);
 		testSuite.addTestSuite(TearDownMBCategoryTest.class);
 		testSuite.addTestSuite(TearDownMBThreadTest.class);
 		testSuite.addTestSuite(TearDownPageTest.class);
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategoriesthreadmessage/ViewMBCategory1ThreadMessageTest.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategoriesthread/ViewMBCategory1ThreadTest.html
similarity index 94%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategoriesthreadmessage/ViewMBCategory1ThreadMessageTest.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategoriesthread/ViewMBCategory1ThreadTest.html
index 4eb29b24946ed3..0fbda917e70f36 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategoriesthreadmessage/ViewMBCategory1ThreadMessageTest.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategoriesthread/ViewMBCategory1ThreadTest.html
@@ -1,12 +1,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>ViewMBCategory1ThreadMessageTest</title>
+<title>ViewMBCategory1ThreadTest</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3">ViewMBCategory1ThreadMessageTest</td></tr>
+<tr><td rowspan="1" colspan="3">ViewMBCategory1ThreadTest</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategoriesthreadmessage/ViewMBCategory1ThreadMessageTest.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategoriesthread/ViewMBCategory1ThreadTest.java
similarity index 93%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategoriesthreadmessage/ViewMBCategory1ThreadMessageTest.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategoriesthread/ViewMBCategory1ThreadTest.java
index 33db348ee61ad9..64c8c582a639a0 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategoriesthreadmessage/ViewMBCategory1ThreadMessageTest.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategoriesthread/ViewMBCategory1ThreadTest.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbcategoriesthreadmessage;
+package com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbcategoriesthread;
 
 import com.liferay.portalweb.portal.BaseTestCase;
 import com.liferay.portalweb.portal.util.RuntimeVariables;
@@ -20,8 +20,8 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class ViewMBCategory1ThreadMessageTest extends BaseTestCase {
-	public void testViewMBCategory1ThreadMessage() throws Exception {
+public class ViewMBCategory1ThreadTest extends BaseTestCase {
+	public void testViewMBCategory1Thread() throws Exception {
 		selenium.open("/web/guest/home/");
 		loadRequiredJavaScriptModules();
 		selenium.clickAt("link=Message Boards Test Page",
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategoriesthreadmessage/ViewMBCategory2ThreadMessageTest.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategoriesthread/ViewMBCategory2ThreadTest.html
similarity index 94%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategoriesthreadmessage/ViewMBCategory2ThreadMessageTest.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategoriesthread/ViewMBCategory2ThreadTest.html
index 41b56938346aff..5abb15de21ab25 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategoriesthreadmessage/ViewMBCategory2ThreadMessageTest.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategoriesthread/ViewMBCategory2ThreadTest.html
@@ -1,12 +1,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>ViewMBCategory2ThreadMessageTest</title>
+<title>ViewMBCategory2ThreadTest</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3">ViewMBCategory2ThreadMessageTest</td></tr>
+<tr><td rowspan="1" colspan="3">ViewMBCategory2ThreadTest</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategoriesthreadmessage/ViewMBCategory2ThreadMessageTest.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategoriesthread/ViewMBCategory2ThreadTest.java
similarity index 93%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategoriesthreadmessage/ViewMBCategory2ThreadMessageTest.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategoriesthread/ViewMBCategory2ThreadTest.java
index 69b3eb31973ea5..cc8accbe79681f 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategoriesthreadmessage/ViewMBCategory2ThreadMessageTest.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategoriesthread/ViewMBCategory2ThreadTest.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbcategoriesthreadmessage;
+package com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbcategoriesthread;
 
 import com.liferay.portalweb.portal.BaseTestCase;
 import com.liferay.portalweb.portal.util.RuntimeVariables;
@@ -20,8 +20,8 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class ViewMBCategory2ThreadMessageTest extends BaseTestCase {
-	public void testViewMBCategory2ThreadMessage() throws Exception {
+public class ViewMBCategory2ThreadTest extends BaseTestCase {
+	public void testViewMBCategory2Thread() throws Exception {
 		selenium.open("/web/guest/home/");
 		loadRequiredJavaScriptModules();
 		selenium.clickAt("link=Message Boards Test Page",
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategoriesthreadmessage/ViewMBCategory3ThreadMessageTest.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategoriesthread/ViewMBCategory3ThreadTest.html
similarity index 94%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategoriesthreadmessage/ViewMBCategory3ThreadMessageTest.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategoriesthread/ViewMBCategory3ThreadTest.html
index 500628d260e4fe..9d4c0ec7c4c74d 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategoriesthreadmessage/ViewMBCategory3ThreadMessageTest.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategoriesthread/ViewMBCategory3ThreadTest.html
@@ -1,12 +1,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>ViewMBCategory3ThreadMessageTest</title>
+<title>ViewMBCategory3ThreadTest</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3">ViewMBCategory3ThreadMessageTest</td></tr>
+<tr><td rowspan="1" colspan="3">ViewMBCategory3ThreadTest</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategoriesthreadmessage/ViewMBCategory3ThreadMessageTest.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategoriesthread/ViewMBCategory3ThreadTest.java
similarity index 93%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategoriesthreadmessage/ViewMBCategory3ThreadMessageTest.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategoriesthread/ViewMBCategory3ThreadTest.java
index 294fef2489c79a..856b6ab8b842dd 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategoriesthreadmessage/ViewMBCategory3ThreadMessageTest.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategoriesthread/ViewMBCategory3ThreadTest.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbcategoriesthreadmessage;
+package com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbcategoriesthread;
 
 import com.liferay.portalweb.portal.BaseTestCase;
 import com.liferay.portalweb.portal.util.RuntimeVariables;
@@ -20,8 +20,8 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class ViewMBCategory3ThreadMessageTest extends BaseTestCase {
-	public void testViewMBCategory3ThreadMessage() throws Exception {
+public class ViewMBCategory3ThreadTest extends BaseTestCase {
+	public void testViewMBCategory3Thread() throws Exception {
 		selenium.open("/web/guest/home/");
 		loadRequiredJavaScriptModules();
 		selenium.clickAt("link=Message Boards Test Page",
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategory1ThreadMessageTest.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategory1ThreadTest.html
similarity index 95%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategory1ThreadMessageTest.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategory1ThreadTest.html
index 438e281336e256..dacf8c05d7b893 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategory1ThreadMessageTest.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategory1ThreadTest.html
@@ -1,12 +1,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>PostNewMBCategory1ThreadMessageTest</title>
+<title>PostNewMBCategory1ThreadTest</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3">PostNewMBCategory1ThreadMessageTest</td></tr>
+<tr><td rowspan="1" colspan="3">PostNewMBCategory1ThreadTest</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategory1ThreadMessageTest.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategory1ThreadTest.java
similarity index 95%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategory1ThreadMessageTest.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategory1ThreadTest.java
index fb2ea4444db89e..916de33716bcc7 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategory1ThreadMessageTest.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategory1ThreadTest.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbcategorythreadmessage;
+package com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbcategorythread;
 
 import com.liferay.portalweb.portal.BaseTestCase;
 import com.liferay.portalweb.portal.util.RuntimeVariables;
@@ -20,8 +20,8 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class PostNewMBCategory1ThreadMessageTest extends BaseTestCase {
-	public void testPostNewMBCategory1ThreadMessage() throws Exception {
+public class PostNewMBCategory1ThreadTest extends BaseTestCase {
+	public void testPostNewMBCategory1Thread() throws Exception {
 		selenium.open("/web/guest/home/");
 		loadRequiredJavaScriptModules();
 		selenium.clickAt("link=Message Boards Test Page",
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategory2ThreadMessageTest.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategory2ThreadTest.html
similarity index 95%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategory2ThreadMessageTest.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategory2ThreadTest.html
index 1a15956f1907b8..f195b039c42c1f 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategory2ThreadMessageTest.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategory2ThreadTest.html
@@ -1,12 +1,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>PostNewMBCategory2ThreadMessageTest</title>
+<title>PostNewMBCategory2ThreadTest</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3">PostNewMBCategory2ThreadMessageTest</td></tr>
+<tr><td rowspan="1" colspan="3">PostNewMBCategory2ThreadTest</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategory2ThreadMessageTest.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategory2ThreadTest.java
similarity index 95%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategory2ThreadMessageTest.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategory2ThreadTest.java
index 609686cb59ccf0..3d254faa551c41 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategory2ThreadMessageTest.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategory2ThreadTest.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbcategorythreadmessage;
+package com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbcategorythread;
 
 import com.liferay.portalweb.portal.BaseTestCase;
 import com.liferay.portalweb.portal.util.RuntimeVariables;
@@ -20,8 +20,8 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class PostNewMBCategory2ThreadMessageTest extends BaseTestCase {
-	public void testPostNewMBCategory2ThreadMessage() throws Exception {
+public class PostNewMBCategory2ThreadTest extends BaseTestCase {
+	public void testPostNewMBCategory2Thread() throws Exception {
 		selenium.open("/web/guest/home/");
 		loadRequiredJavaScriptModules();
 		selenium.clickAt("link=Message Boards Test Page",
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategory3ThreadMessageTest.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategory3ThreadTest.html
similarity index 95%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategory3ThreadMessageTest.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategory3ThreadTest.html
index 9829e8c1418d43..8b6cc7e1e272c4 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategory3ThreadMessageTest.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategory3ThreadTest.html
@@ -1,12 +1,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>PostNewMBCategory3ThreadMessageTest</title>
+<title>PostNewMBCategory3ThreadTest</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3">PostNewMBCategory3ThreadMessageTest</td></tr>
+<tr><td rowspan="1" colspan="3">PostNewMBCategory3ThreadTest</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategory3ThreadMessageTest.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategory3ThreadTest.java
similarity index 95%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategory3ThreadMessageTest.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategory3ThreadTest.java
index f25217bb5a574f..e8e7246298e459 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategory3ThreadMessageTest.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategory3ThreadTest.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbcategorythreadmessage;
+package com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbcategorythread;
 
 import com.liferay.portalweb.portal.BaseTestCase;
 import com.liferay.portalweb.portal.util.RuntimeVariables;
@@ -20,8 +20,8 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class PostNewMBCategory3ThreadMessageTest extends BaseTestCase {
-	public void testPostNewMBCategory3ThreadMessage() throws Exception {
+public class PostNewMBCategory3ThreadTest extends BaseTestCase {
+	public void testPostNewMBCategory3Thread() throws Exception {
 		selenium.open("/web/guest/home/");
 		loadRequiredJavaScriptModules();
 		selenium.clickAt("link=Message Boards Test Page",
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThread1MessageTest.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategoryThread1Test.html
similarity index 95%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThread1MessageTest.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategoryThread1Test.html
index 1cd3d7f137aca9..28bf90a68452ef 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThread1MessageTest.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategoryThread1Test.html
@@ -1,12 +1,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>PostNewMBCategoryThread1MessageTest</title>
+<title>PostNewMBCategoryThread1Test</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3">PostNewMBCategoryThread1MessageTest</td></tr>
+<tr><td rowspan="1" colspan="3">PostNewMBCategoryThread1Test</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThread1MessageTest.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategoryThread1Test.java
similarity index 94%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThread1MessageTest.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategoryThread1Test.java
index 605a4ce98fff86..150c88ac9b3bc8 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThread1MessageTest.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategoryThread1Test.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbcategorythreadmessage;
+package com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbcategorythread;
 
 import com.liferay.portalweb.portal.BaseTestCase;
 import com.liferay.portalweb.portal.util.RuntimeVariables;
@@ -20,8 +20,8 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class PostNewMBCategoryThread1MessageTest extends BaseTestCase {
-	public void testPostNewMBCategoryThread1Message() throws Exception {
+public class PostNewMBCategoryThread1Test extends BaseTestCase {
+	public void testPostNewMBCategoryThread1() throws Exception {
 		selenium.open("/web/guest/home/");
 		loadRequiredJavaScriptModules();
 		selenium.clickAt("link=Message Boards Test Page",
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThread2MessageTest.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategoryThread2Test.html
similarity index 95%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThread2MessageTest.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategoryThread2Test.html
index 0778dacc51fb72..d11425fe7310a9 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThread2MessageTest.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategoryThread2Test.html
@@ -1,12 +1,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>PostNewMBCategoryThread2MessageTest</title>
+<title>PostNewMBCategoryThread2Test</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3">PostNewMBCategoryThread2MessageTest</td></tr>
+<tr><td rowspan="1" colspan="3">PostNewMBCategoryThread2Test</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThread2MessageTest.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategoryThread2Test.java
similarity index 94%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThread2MessageTest.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategoryThread2Test.java
index 5af0eecec89502..6130f4376dc638 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThread2MessageTest.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategoryThread2Test.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbcategorythreadmessage;
+package com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbcategorythread;
 
 import com.liferay.portalweb.portal.BaseTestCase;
 import com.liferay.portalweb.portal.util.RuntimeVariables;
@@ -20,8 +20,8 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class PostNewMBCategoryThread2MessageTest extends BaseTestCase {
-	public void testPostNewMBCategoryThread2Message() throws Exception {
+public class PostNewMBCategoryThread2Test extends BaseTestCase {
+	public void testPostNewMBCategoryThread2() throws Exception {
 		selenium.open("/web/guest/home/");
 		loadRequiredJavaScriptModules();
 		selenium.clickAt("link=Message Boards Test Page",
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThread3MessageTest.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategoryThread3Test.html
similarity index 95%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThread3MessageTest.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategoryThread3Test.html
index 6a04f037029879..ca87e7d1d2de5f 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThread3MessageTest.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategoryThread3Test.html
@@ -1,12 +1,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>PostNewMBCategoryThread3MessageTest</title>
+<title>PostNewMBCategoryThread3Test</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3">PostNewMBCategoryThread3MessageTest</td></tr>
+<tr><td rowspan="1" colspan="3">PostNewMBCategoryThread3Test</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThread3MessageTest.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategoryThread3Test.java
similarity index 94%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThread3MessageTest.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategoryThread3Test.java
index 4ac3252f24b9bf..744b3471a08980 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThread3MessageTest.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategoryThread3Test.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbcategorythreadmessage;
+package com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbcategorythread;
 
 import com.liferay.portalweb.portal.BaseTestCase;
 import com.liferay.portalweb.portal.util.RuntimeVariables;
@@ -20,8 +20,8 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class PostNewMBCategoryThread3MessageTest extends BaseTestCase {
-	public void testPostNewMBCategoryThread3Message() throws Exception {
+public class PostNewMBCategoryThread3Test extends BaseTestCase {
+	public void testPostNewMBCategoryThread3() throws Exception {
 		selenium.open("/web/guest/home/");
 		loadRequiredJavaScriptModules();
 		selenium.clickAt("link=Message Boards Test Page",
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThread4MessageTest.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategoryThread4Test.html
similarity index 95%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThread4MessageTest.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategoryThread4Test.html
index cb74be6eab39ca..3236292e09500b 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThread4MessageTest.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategoryThread4Test.html
@@ -1,12 +1,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>PostNewMBCategoryThread4MessageTest</title>
+<title>PostNewMBCategoryThread4Test</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3">PostNewMBCategoryThread4MessageTest</td></tr>
+<tr><td rowspan="1" colspan="3">PostNewMBCategoryThread4Test</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThread4MessageTest.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategoryThread4Test.java
similarity index 94%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThread4MessageTest.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategoryThread4Test.java
index ac59bbb5e58d18..3004beaa98a797 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThread4MessageTest.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategoryThread4Test.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbcategorythreadmessage;
+package com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbcategorythread;
 
 import com.liferay.portalweb.portal.BaseTestCase;
 import com.liferay.portalweb.portal.util.RuntimeVariables;
@@ -20,8 +20,8 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class PostNewMBCategoryThread4MessageTest extends BaseTestCase {
-	public void testPostNewMBCategoryThread4Message() throws Exception {
+public class PostNewMBCategoryThread4Test extends BaseTestCase {
+	public void testPostNewMBCategoryThread4() throws Exception {
 		selenium.open("/web/guest/home/");
 		loadRequiredJavaScriptModules();
 		selenium.clickAt("link=Message Boards Test Page",
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThread5MessageTest.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategoryThread5Test.html
similarity index 95%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThread5MessageTest.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategoryThread5Test.html
index 32cd8e27d6cea0..172df7b5449990 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThread5MessageTest.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategoryThread5Test.html
@@ -1,12 +1,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>PostNewMBCategoryThread5MessageTest</title>
+<title>PostNewMBCategoryThread5Test</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3">PostNewMBCategoryThread5MessageTest</td></tr>
+<tr><td rowspan="1" colspan="3">PostNewMBCategoryThread5Test</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThread5MessageTest.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategoryThread5Test.java
similarity index 94%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThread5MessageTest.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategoryThread5Test.java
index 37538e6bef9f3a..116e218fd00183 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThread5MessageTest.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategoryThread5Test.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbcategorythreadmessage;
+package com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbcategorythread;
 
 import com.liferay.portalweb.portal.BaseTestCase;
 import com.liferay.portalweb.portal.util.RuntimeVariables;
@@ -20,8 +20,8 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class PostNewMBCategoryThread5MessageTest extends BaseTestCase {
-	public void testPostNewMBCategoryThread5Message() throws Exception {
+public class PostNewMBCategoryThread5Test extends BaseTestCase {
+	public void testPostNewMBCategoryThread5() throws Exception {
 		selenium.open("/web/guest/home/");
 		loadRequiredJavaScriptModules();
 		selenium.clickAt("link=Message Boards Test Page",
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThread6MessageTest.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategoryThread6Test.html
similarity index 95%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThread6MessageTest.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategoryThread6Test.html
index 9f28ee2fbbdaac..63b75551628956 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThread6MessageTest.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategoryThread6Test.html
@@ -1,12 +1,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>PostNewMBCategoryThread6MessageTest</title>
+<title>PostNewMBCategoryThread6Test</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3">PostNewMBCategoryThread6MessageTest</td></tr>
+<tr><td rowspan="1" colspan="3">PostNewMBCategoryThread6Test</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThread6MessageTest.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategoryThread6Test.java
similarity index 94%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThread6MessageTest.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategoryThread6Test.java
index 75bdbf22d156b8..1b4a451eb93d2b 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThread6MessageTest.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategoryThread6Test.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbcategorythreadmessage;
+package com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbcategorythread;
 
 import com.liferay.portalweb.portal.BaseTestCase;
 import com.liferay.portalweb.portal.util.RuntimeVariables;
@@ -20,8 +20,8 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class PostNewMBCategoryThread6MessageTest extends BaseTestCase {
-	public void testPostNewMBCategoryThread6Message() throws Exception {
+public class PostNewMBCategoryThread6Test extends BaseTestCase {
+	public void testPostNewMBCategoryThread6() throws Exception {
 		selenium.open("/web/guest/home/");
 		loadRequiredJavaScriptModules();
 		selenium.clickAt("link=Message Boards Test Page",
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThreadMessageTest.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategoryThreadTest.html
similarity index 95%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThreadMessageTest.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategoryThreadTest.html
index d815e89a653bea..2b2fbf985ed5b2 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThreadMessageTest.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategoryThreadTest.html
@@ -1,12 +1,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>PostNewMBCategoryThreadMessageTest</title>
+<title>PostNewMBCategoryThreadTest</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3">PostNewMBCategoryThreadMessageTest</td></tr>
+<tr><td rowspan="1" colspan="3">PostNewMBCategoryThreadTest</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThreadMessageTest.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategoryThreadTest.java
similarity index 95%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThreadMessageTest.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategoryThreadTest.java
index a1fae83a5160e5..3a1269f4b4c487 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThreadMessageTest.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategoryThreadTest.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbcategorythreadmessage;
+package com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbcategorythread;
 
 import com.liferay.portalweb.portal.BaseTestCase;
 import com.liferay.portalweb.portal.util.RuntimeVariables;
@@ -20,8 +20,8 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class PostNewMBCategoryThreadMessageTest extends BaseTestCase {
-	public void testPostNewMBCategoryThreadMessage() throws Exception {
+public class PostNewMBCategoryThreadTest extends BaseTestCase {
+	public void testPostNewMBCategoryThread() throws Exception {
 		selenium.open("/web/guest/home/");
 		loadRequiredJavaScriptModules();
 		selenium.clickAt("link=Message Boards Test Page",
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThreadMessageTests.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategoryThreadTests.html
similarity index 80%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThreadMessageTests.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategoryThreadTests.html
index 36b051709d6ee7..c02a1492c476d0 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThreadMessageTests.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategoryThreadTests.html
@@ -11,10 +11,10 @@
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPageMBTest.html">AddPageMBTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPortletMBTest.html">AddPortletMBTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/AddMBCategoryTest.html">AddMBCategoryTest</a></td></tr>
-<tr><td><a href="PostNewMBCategoryThreadMessageTest.html">PostNewMBCategoryThreadMessageTest</a></td></tr>
-<tr><td><a href="ViewMBCategoryThreadMessageTest.html">ViewMBCategoryThreadMessageTest</a></td></tr>
+<tr><td><a href="PostNewMBCategoryThreadTest.html">PostNewMBCategoryThreadTest</a></td></tr>
+<tr><td><a href="ViewMBCategoryThreadTest.html">ViewMBCategoryThreadTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/TearDownMBCategoryTest.html">TearDownMBCategoryTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/postnewmbthreadmessage/TearDownMBThreadTest.html">TearDownMBThreadTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/postnewmbthread/TearDownMBThreadTest.html">TearDownMBThreadTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portal/util/TearDownPageTest.html">TearDownPageTest</a></td></tr>
 </tbody></table>
 </body>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThreadMessageTests.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategoryThreadTests.java
similarity index 79%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThreadMessageTests.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategoryThreadTests.java
index 7ee8dc21019613..d63188db7edb95 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThreadMessageTests.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategoryThreadTests.java
@@ -12,13 +12,13 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbcategorythreadmessage;
+package com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbcategorythread;
 
 import com.liferay.portalweb.portal.BaseTestSuite;
 import com.liferay.portalweb.portal.util.TearDownPageTest;
 import com.liferay.portalweb.portlet.messageboards.mbcategory.addmbcategory.AddMBCategoryTest;
 import com.liferay.portalweb.portlet.messageboards.mbcategory.addmbcategory.TearDownMBCategoryTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbthreadmessage.TearDownMBThreadTest;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbthread.TearDownMBThreadTest;
 import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPageMBTest;
 import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPortletMBTest;
 
@@ -28,14 +28,14 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class PostNewMBCategoryThreadMessageTests extends BaseTestSuite {
+public class PostNewMBCategoryThreadTests extends BaseTestSuite {
 	public static Test suite() {
 		TestSuite testSuite = new TestSuite();
 		testSuite.addTestSuite(AddPageMBTest.class);
 		testSuite.addTestSuite(AddPortletMBTest.class);
 		testSuite.addTestSuite(AddMBCategoryTest.class);
-		testSuite.addTestSuite(PostNewMBCategoryThreadMessageTest.class);
-		testSuite.addTestSuite(ViewMBCategoryThreadMessageTest.class);
+		testSuite.addTestSuite(PostNewMBCategoryThreadTest.class);
+		testSuite.addTestSuite(ViewMBCategoryThreadTest.class);
 		testSuite.addTestSuite(TearDownMBCategoryTest.class);
 		testSuite.addTestSuite(TearDownMBThreadTest.class);
 		testSuite.addTestSuite(TearDownPageTest.class);
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/ViewMBCategoryThreadMessageTest.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/ViewMBCategoryThreadTest.html
similarity index 94%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/ViewMBCategoryThreadMessageTest.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/ViewMBCategoryThreadTest.html
index a2c25900b147d0..8820f1e4ca5dab 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/ViewMBCategoryThreadMessageTest.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/ViewMBCategoryThreadTest.html
@@ -1,12 +1,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>ViewMBCategoryThreadMessageTest</title>
+<title>ViewMBCategoryThreadTest</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3">ViewMBCategoryThreadMessageTest</td></tr>
+<tr><td rowspan="1" colspan="3">ViewMBCategoryThreadTest</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/ViewMBCategoryThreadMessageTest.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/ViewMBCategoryThreadTest.java
similarity index 93%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/ViewMBCategoryThreadMessageTest.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/ViewMBCategoryThreadTest.java
index 02494dfdbcf46a..621a591f243c36 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/ViewMBCategoryThreadMessageTest.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/ViewMBCategoryThreadTest.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbcategorythreadmessage;
+package com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbcategorythread;
 
 import com.liferay.portalweb.portal.BaseTestCase;
 import com.liferay.portalweb.portal.util.RuntimeVariables;
@@ -20,8 +20,8 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class ViewMBCategoryThreadMessageTest extends BaseTestCase {
-	public void testViewMBCategoryThreadMessage() throws Exception {
+public class ViewMBCategoryThreadTest extends BaseTestCase {
+	public void testViewMBCategoryThread() throws Exception {
 		selenium.open("/web/guest/home/");
 		loadRequiredJavaScriptModules();
 		selenium.clickAt("link=Message Boards Test Page",
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessagebodynull/AddMBCategoryMessageBodyNullTest.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythreadbodynull/PostNewMBCategoryThreadBodyNullTest.html
similarity index 96%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessagebodynull/AddMBCategoryMessageBodyNullTest.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythreadbodynull/PostNewMBCategoryThreadBodyNullTest.html
index c8dbf122656ae3..511b1d3dabe852 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessagebodynull/AddMBCategoryMessageBodyNullTest.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythreadbodynull/PostNewMBCategoryThreadBodyNullTest.html
@@ -1,12 +1,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>AddMBCategoryMessageBodyNullTest</title>
+<title>PostNewMBCategoryThreadBodyNullTest</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3">AddMBCategoryMessageBodyNullTest</td></tr>
+<tr><td rowspan="1" colspan="3">PostNewMBCategoryThreadBodyNullTest</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessagebodynull/AddMBCategoryMessageBodyNullTest.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythreadbodynull/PostNewMBCategoryThreadBodyNullTest.java
similarity index 96%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessagebodynull/AddMBCategoryMessageBodyNullTest.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythreadbodynull/PostNewMBCategoryThreadBodyNullTest.java
index 0ea4732aeadb03..3d420b504d711a 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessagebodynull/AddMBCategoryMessageBodyNullTest.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythreadbodynull/PostNewMBCategoryThreadBodyNullTest.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.addmbcategorymessagebodynull;
+package com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbcategorythreadbodynull;
 
 import com.liferay.portalweb.portal.BaseTestCase;
 import com.liferay.portalweb.portal.util.RuntimeVariables;
@@ -20,8 +20,8 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class AddMBCategoryMessageBodyNullTest extends BaseTestCase {
-	public void testAddMBCategoryMessageBodyNull() throws Exception {
+public class PostNewMBCategoryThreadBodyNullTest extends BaseTestCase {
+	public void testPostNewMBCategoryThreadBodyNull() throws Exception {
 		selenium.open("/web/guest/home/");
 		loadRequiredJavaScriptModules();
 
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessagesubjectnull/AddMBCategoryMessageSubjectNullTests.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythreadbodynull/PostNewMBCategoryThreadBodyNullTests.html
similarity index 83%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessagesubjectnull/AddMBCategoryMessageSubjectNullTests.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythreadbodynull/PostNewMBCategoryThreadBodyNullTests.html
index 73410b8ebc9479..4f751b1432505a 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessagesubjectnull/AddMBCategoryMessageSubjectNullTests.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythreadbodynull/PostNewMBCategoryThreadBodyNullTests.html
@@ -3,15 +3,15 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
   <meta content="text/html; charset=UTF-8" http-equiv="content-type" />
-  <title>AddMBCategoryMessageSubjectNullTests</title>
+  <title>PostNewMBCategoryThreadBodyNullTests</title>
 </head>
 <body>
 <table id="suiteTable" cellpadding="1" cellspacing="1" border="1" class="selenium"><tbody>
-<tr><td><b>AddMBCategoryMessageSubjectNullTests</b></td></tr>
+<tr><td><b>PostNewMBCategoryThreadBodyNullTests</b></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPageMBTest.html">AddPageMBTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPortletMBTest.html">AddPortletMBTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/AddMBCategoryTest.html">AddMBCategoryTest</a></td></tr>
-<tr><td><a href="AddMBCategoryMessageSubjectNullTest.html">AddMBCategoryMessageSubjectNullTest</a></td></tr>
+<tr><td><a href="PostNewMBCategoryThreadBodyNullTest.html">PostNewMBCategoryThreadBodyNullTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/TearDownMBCategoryTest.html">TearDownMBCategoryTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portal/util/TearDownPageTest.html">TearDownPageTest</a></td></tr>
 </tbody></table>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessagesubjectnull/AddMBCategoryMessageSubjectNullTests.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythreadbodynull/PostNewMBCategoryThreadBodyNullTests.java
similarity index 87%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessagesubjectnull/AddMBCategoryMessageSubjectNullTests.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythreadbodynull/PostNewMBCategoryThreadBodyNullTests.java
index 7928f8a924dd4a..5703fc266e0497 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessagesubjectnull/AddMBCategoryMessageSubjectNullTests.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythreadbodynull/PostNewMBCategoryThreadBodyNullTests.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.addmbcategorymessagesubjectnull;
+package com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbcategorythreadbodynull;
 
 import com.liferay.portalweb.portal.BaseTestSuite;
 import com.liferay.portalweb.portal.util.TearDownPageTest;
@@ -27,13 +27,13 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class AddMBCategoryMessageSubjectNullTests extends BaseTestSuite {
+public class PostNewMBCategoryThreadBodyNullTests extends BaseTestSuite {
 	public static Test suite() {
 		TestSuite testSuite = new TestSuite();
 		testSuite.addTestSuite(AddPageMBTest.class);
 		testSuite.addTestSuite(AddPortletMBTest.class);
 		testSuite.addTestSuite(AddMBCategoryTest.class);
-		testSuite.addTestSuite(AddMBCategoryMessageSubjectNullTest.class);
+		testSuite.addTestSuite(PostNewMBCategoryThreadBodyNullTest.class);
 		testSuite.addTestSuite(TearDownMBCategoryTest.class);
 		testSuite.addTestSuite(TearDownPageTest.class);
 
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/markasanswermbcategorymessagequestionreply/AddMBCategoryMessageQuestionTest.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythreadquestion/PostNewMBCategoryThreadQuestionTest.html
similarity index 96%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/markasanswermbcategorymessagequestionreply/AddMBCategoryMessageQuestionTest.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythreadquestion/PostNewMBCategoryThreadQuestionTest.html
index 373c901436e706..207cfff8505e82 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/markasanswermbcategorymessagequestionreply/AddMBCategoryMessageQuestionTest.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythreadquestion/PostNewMBCategoryThreadQuestionTest.html
@@ -1,12 +1,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>AddMBCategoryMessageQuestionTest</title>
+<title>PostNewMBCategoryThreadQuestionTest</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3">AddMBCategoryMessageQuestionTest</td></tr>
+<tr><td rowspan="1" colspan="3">PostNewMBCategoryThreadQuestionTest</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/unmarkmbcategorymessagequestionreply/AddMBCategoryMessageQuestionTest.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythreadquestion/PostNewMBCategoryThreadQuestionTest.java
similarity index 96%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/unmarkmbcategorymessagequestionreply/AddMBCategoryMessageQuestionTest.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythreadquestion/PostNewMBCategoryThreadQuestionTest.java
index e3d73867e4909f..0bc3569a6dfa40 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/unmarkmbcategorymessagequestionreply/AddMBCategoryMessageQuestionTest.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythreadquestion/PostNewMBCategoryThreadQuestionTest.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.unmarkmbcategorymessagequestionreply;
+package com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbcategorythreadquestion;
 
 import com.liferay.portalweb.portal.BaseTestCase;
 import com.liferay.portalweb.portal.util.RuntimeVariables;
@@ -20,8 +20,8 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class AddMBCategoryMessageQuestionTest extends BaseTestCase {
-	public void testAddMBCategoryMessageQuestion() throws Exception {
+public class PostNewMBCategoryThreadQuestionTest extends BaseTestCase {
+	public void testPostNewMBCategoryThreadQuestion() throws Exception {
 		selenium.open("/web/guest/home/");
 		loadRequiredJavaScriptModules();
 
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessagequestion/AddMBCategoryMessageQuestionTests.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythreadquestion/PostNewMBCategoryThreadQuestionTests.html
similarity index 83%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessagequestion/AddMBCategoryMessageQuestionTests.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythreadquestion/PostNewMBCategoryThreadQuestionTests.html
index 682e07a1256f38..9fe39a807e167c 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessagequestion/AddMBCategoryMessageQuestionTests.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythreadquestion/PostNewMBCategoryThreadQuestionTests.html
@@ -3,15 +3,15 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
   <meta content="text/html; charset=UTF-8" http-equiv="content-type" />
-  <title>AddMBCategoryMessageQuestionTests</title>
+  <title>PostNewMBCategoryThreadQuestionTests</title>
 </head>
 <body>
 <table id="suiteTable" cellpadding="1" cellspacing="1" border="1" class="selenium"><tbody>
-<tr><td><b>AddMBCategoryMessageQuestionTests</b></td></tr>
+<tr><td><b>PostNewMBCategoryThreadQuestionTests</b></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPageMBTest.html">AddPageMBTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPortletMBTest.html">AddPortletMBTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/AddMBCategoryTest.html">AddMBCategoryTest</a></td></tr>
-<tr><td><a href="AddMBCategoryMessageQuestionTest.html">AddMBCategoryMessageQuestionTest</a></td></tr>
+<tr><td><a href="PostNewMBCategoryThreadQuestionTest.html">PostNewMBCategoryThreadQuestionTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/TearDownMBCategoryTest.html">TearDownMBCategoryTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portal/util/TearDownPageTest.html">TearDownPageTest</a></td></tr>
 </tbody></table>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessagebodynull/AddMBCategoryMessageBodyNullTests.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythreadquestion/PostNewMBCategoryThreadQuestionTests.java
similarity index 86%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessagebodynull/AddMBCategoryMessageBodyNullTests.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythreadquestion/PostNewMBCategoryThreadQuestionTests.java
index bf53e0e40e8b0a..2abab0caa8359c 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessagebodynull/AddMBCategoryMessageBodyNullTests.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythreadquestion/PostNewMBCategoryThreadQuestionTests.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.addmbcategorymessagebodynull;
+package com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbcategorythreadquestion;
 
 import com.liferay.portalweb.portal.BaseTestSuite;
 import com.liferay.portalweb.portal.util.TearDownPageTest;
@@ -27,13 +27,13 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class AddMBCategoryMessageBodyNullTests extends BaseTestSuite {
+public class PostNewMBCategoryThreadQuestionTests extends BaseTestSuite {
 	public static Test suite() {
 		TestSuite testSuite = new TestSuite();
 		testSuite.addTestSuite(AddPageMBTest.class);
 		testSuite.addTestSuite(AddPortletMBTest.class);
 		testSuite.addTestSuite(AddMBCategoryTest.class);
-		testSuite.addTestSuite(AddMBCategoryMessageBodyNullTest.class);
+		testSuite.addTestSuite(PostNewMBCategoryThreadQuestionTest.class);
 		testSuite.addTestSuite(TearDownMBCategoryTest.class);
 		testSuite.addTestSuite(TearDownPageTest.class);
 
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/splitthreadmbcategorymessagereplyreply/SplitThreadMBCategoryMessageReplyReplyTests.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythreads/PostNewMBCategoryThreadsTests.html
similarity index 64%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/splitthreadmbcategorymessagereplyreply/SplitThreadMBCategoryMessageReplyReplyTests.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythreads/PostNewMBCategoryThreadsTests.html
index bb3df83d8398e7..4cd5e395f9b957 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/splitthreadmbcategorymessagereplyreply/SplitThreadMBCategoryMessageReplyReplyTests.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythreads/PostNewMBCategoryThreadsTests.html
@@ -11,13 +11,14 @@
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPageMBTest.html">AddPageMBTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPortletMBTest.html">AddPortletMBTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/AddMBCategoryTest.html">AddMBCategoryTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThreadMessageTest.html">PostNewMBCategoryThreadMessageTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/replymbcategorythreadmessagereply/ReplyMBCategoryThreadMessageReplyTest.html">ReplyMBCategoryThreadMessageReplyTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/replymbcategorythreadmessagereplyreply/ReplyMBCategoryThreadMessageReplyReplyTest.html">ReplyMBCategoryThreadMessageReplyReplyTest</a></td></tr>
-<tr><td><a href="SplitThreadMBCategoryMessageReplyReplyTest.html">SplitThreadMBCategoryMessageReplyReplyTest</a></td></tr>
-<tr><td><a href="ViewSplitThreadMBCategoryMessageReplyReplyTest.html">ViewSplitThreadMBCategoryMessageReplyReplyTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategoryThread1Test.html">PostNewMBCategoryThread1Test</a></td></tr>
+<tr><td><a href="ViewMBCategoryThread1Test.html">ViewMBCategoryThread1Test</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategoryThread2Test.html">PostNewMBCategoryThread2Test</a></td></tr>
+<tr><td><a href="ViewMBCategoryThread2Test.html">ViewMBCategoryThread2Test</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategoryThread3Test.html">PostNewMBCategoryThread3Test</a></td></tr>
+<tr><td><a href="ViewMBCategoryThread3Test.html">ViewMBCategoryThread3Test</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/TearDownMBCategoryTest.html">TearDownMBCategoryTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/postnewmbthreadmessage/TearDownMBThreadTest.html">TearDownMBThreadTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/postnewmbthread/TearDownMBThreadTest.html">TearDownMBThreadTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portal/util/TearDownPageTest.html">TearDownPageTest</a></td></tr>
 </tbody></table>
 </body>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbcategorythreadmessagereplyreply/ReplyMBCategoryThreadMessageReplyReplyTests.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythreads/PostNewMBCategoryThreadsTests.java
similarity index 62%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbcategorythreadmessagereplyreply/ReplyMBCategoryThreadMessageReplyReplyTests.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythreads/PostNewMBCategoryThreadsTests.java
index 415c47f6e10279..ef8cd98487ed00 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbcategorythreadmessagereplyreply/ReplyMBCategoryThreadMessageReplyReplyTests.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythreads/PostNewMBCategoryThreadsTests.java
@@ -12,15 +12,16 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.replymbcategorythreadmessagereplyreply;
+package com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbcategorythreads;
 
 import com.liferay.portalweb.portal.BaseTestSuite;
 import com.liferay.portalweb.portal.util.TearDownPageTest;
 import com.liferay.portalweb.portlet.messageboards.mbcategory.addmbcategory.AddMBCategoryTest;
 import com.liferay.portalweb.portlet.messageboards.mbcategory.addmbcategory.TearDownMBCategoryTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbcategorythreadmessage.PostNewMBCategoryThreadMessageTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbthreadmessage.TearDownMBThreadTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.replymbcategorythreadmessagereply.ReplyMBCategoryThreadMessageReplyTest;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbcategorythread.PostNewMBCategoryThread1Test;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbcategorythread.PostNewMBCategoryThread2Test;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbcategorythread.PostNewMBCategoryThread3Test;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbthread.TearDownMBThreadTest;
 import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPageMBTest;
 import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPortletMBTest;
 
@@ -30,16 +31,18 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class ReplyMBCategoryThreadMessageReplyReplyTests extends BaseTestSuite {
+public class PostNewMBCategoryThreadsTests extends BaseTestSuite {
 	public static Test suite() {
 		TestSuite testSuite = new TestSuite();
 		testSuite.addTestSuite(AddPageMBTest.class);
 		testSuite.addTestSuite(AddPortletMBTest.class);
 		testSuite.addTestSuite(AddMBCategoryTest.class);
-		testSuite.addTestSuite(PostNewMBCategoryThreadMessageTest.class);
-		testSuite.addTestSuite(ReplyMBCategoryThreadMessageReplyTest.class);
-		testSuite.addTestSuite(ReplyMBCategoryThreadMessageReplyReplyTest.class);
-		testSuite.addTestSuite(ViewMBCategoryThreadMessageReplyReplyTest.class);
+		testSuite.addTestSuite(PostNewMBCategoryThread1Test.class);
+		testSuite.addTestSuite(ViewMBCategoryThread1Test.class);
+		testSuite.addTestSuite(PostNewMBCategoryThread2Test.class);
+		testSuite.addTestSuite(ViewMBCategoryThread2Test.class);
+		testSuite.addTestSuite(PostNewMBCategoryThread3Test.class);
+		testSuite.addTestSuite(ViewMBCategoryThread3Test.class);
 		testSuite.addTestSuite(TearDownMBCategoryTest.class);
 		testSuite.addTestSuite(TearDownMBThreadTest.class);
 		testSuite.addTestSuite(TearDownPageTest.class);
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadsmessage/ViewMBCategoryThread1MessageTest.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythreads/ViewMBCategoryThread1Test.html
similarity index 94%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadsmessage/ViewMBCategoryThread1MessageTest.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythreads/ViewMBCategoryThread1Test.html
index 3765dabb0fa1f3..3430314531ce98 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadsmessage/ViewMBCategoryThread1MessageTest.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythreads/ViewMBCategoryThread1Test.html
@@ -1,12 +1,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>ViewMBCategoryThread1MessageTest</title>
+<title>ViewMBCategoryThread1Test</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3">ViewMBCategoryThread1MessageTest</td></tr>
+<tr><td rowspan="1" colspan="3">ViewMBCategoryThread1Test</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadsmessage/ViewMBCategoryThread1MessageTest.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythreads/ViewMBCategoryThread1Test.java
similarity index 93%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadsmessage/ViewMBCategoryThread1MessageTest.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythreads/ViewMBCategoryThread1Test.java
index 683998b726dce5..37a8d8a1e46af3 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadsmessage/ViewMBCategoryThread1MessageTest.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythreads/ViewMBCategoryThread1Test.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbcategorythreadsmessage;
+package com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbcategorythreads;
 
 import com.liferay.portalweb.portal.BaseTestCase;
 import com.liferay.portalweb.portal.util.RuntimeVariables;
@@ -20,8 +20,8 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class ViewMBCategoryThread1MessageTest extends BaseTestCase {
-	public void testViewMBCategoryThread1Message() throws Exception {
+public class ViewMBCategoryThread1Test extends BaseTestCase {
+	public void testViewMBCategoryThread1() throws Exception {
 		selenium.open("/web/guest/home/");
 		loadRequiredJavaScriptModules();
 		selenium.clickAt("link=Message Boards Test Page",
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadsmessage/ViewMBCategoryThread2MessageTest.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythreads/ViewMBCategoryThread2Test.html
similarity index 95%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadsmessage/ViewMBCategoryThread2MessageTest.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythreads/ViewMBCategoryThread2Test.html
index 5552a2c45e61a6..b5e738553147b5 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadsmessage/ViewMBCategoryThread2MessageTest.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythreads/ViewMBCategoryThread2Test.html
@@ -1,12 +1,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>ViewMBCategoryThread2MessageTest</title>
+<title>ViewMBCategoryThread2Test</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3">ViewMBCategoryThread2MessageTest</td></tr>
+<tr><td rowspan="1" colspan="3">ViewMBCategoryThread2Test</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadsmessage/ViewMBCategoryThread2MessageTest.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythreads/ViewMBCategoryThread2Test.java
similarity index 94%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadsmessage/ViewMBCategoryThread2MessageTest.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythreads/ViewMBCategoryThread2Test.java
index 58f7534a6de0a2..d0f6f0899c0a19 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadsmessage/ViewMBCategoryThread2MessageTest.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythreads/ViewMBCategoryThread2Test.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbcategorythreadsmessage;
+package com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbcategorythreads;
 
 import com.liferay.portalweb.portal.BaseTestCase;
 import com.liferay.portalweb.portal.util.RuntimeVariables;
@@ -20,8 +20,8 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class ViewMBCategoryThread2MessageTest extends BaseTestCase {
-	public void testViewMBCategoryThread2Message() throws Exception {
+public class ViewMBCategoryThread2Test extends BaseTestCase {
+	public void testViewMBCategoryThread2() throws Exception {
 		selenium.open("/web/guest/home/");
 		loadRequiredJavaScriptModules();
 		selenium.clickAt("link=Message Boards Test Page",
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadsmessage/ViewMBCategoryThread3MessageTest.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythreads/ViewMBCategoryThread3Test.html
similarity index 96%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadsmessage/ViewMBCategoryThread3MessageTest.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythreads/ViewMBCategoryThread3Test.html
index 15f4e28690e255..95ff73b590046a 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadsmessage/ViewMBCategoryThread3MessageTest.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythreads/ViewMBCategoryThread3Test.html
@@ -1,12 +1,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>ViewMBCategoryThread3MessageTest</title>
+<title>ViewMBCategoryThread3Test</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3">ViewMBCategoryThread3MessageTest</td></tr>
+<tr><td rowspan="1" colspan="3">ViewMBCategoryThread3Test</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadsmessage/ViewMBCategoryThread3MessageTest.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythreads/ViewMBCategoryThread3Test.java
similarity index 95%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadsmessage/ViewMBCategoryThread3MessageTest.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythreads/ViewMBCategoryThread3Test.java
index 0afec5a89f367c..3d5c7581cf46b3 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadsmessage/ViewMBCategoryThread3MessageTest.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythreads/ViewMBCategoryThread3Test.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbcategorythreadsmessage;
+package com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbcategorythreads;
 
 import com.liferay.portalweb.portal.BaseTestCase;
 import com.liferay.portalweb.portal.util.RuntimeVariables;
@@ -20,8 +20,8 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class ViewMBCategoryThread3MessageTest extends BaseTestCase {
-	public void testViewMBCategoryThread3Message() throws Exception {
+public class ViewMBCategoryThread3Test extends BaseTestCase {
+	public void testViewMBCategoryThread3() throws Exception {
 		selenium.open("/web/guest/home/");
 		loadRequiredJavaScriptModules();
 		selenium.clickAt("link=Message Boards Test Page",
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessagesubjectnull/AddMBCategoryMessageSubjectNullTest.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythreadsubjectnull/PostNewMBCategoryThreadSubjectNullTest.html
similarity index 95%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessagesubjectnull/AddMBCategoryMessageSubjectNullTest.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythreadsubjectnull/PostNewMBCategoryThreadSubjectNullTest.html
index 0242ab9db63dda..7a3c3c824ed5a5 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessagesubjectnull/AddMBCategoryMessageSubjectNullTest.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythreadsubjectnull/PostNewMBCategoryThreadSubjectNullTest.html
@@ -1,12 +1,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>AddMBCategoryMessageSubjectNullTest</title>
+<title>PostNewMBCategoryThreadSubjectNullTest</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3">AddMBCategoryMessageSubjectNullTest</td></tr>
+<tr><td rowspan="1" colspan="3">PostNewMBCategoryThreadSubjectNullTest</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessagesubjectnull/AddMBCategoryMessageSubjectNullTest.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythreadsubjectnull/PostNewMBCategoryThreadSubjectNullTest.java
similarity index 95%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessagesubjectnull/AddMBCategoryMessageSubjectNullTest.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythreadsubjectnull/PostNewMBCategoryThreadSubjectNullTest.java
index 6ef6b61e054254..37cc83db896644 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessagesubjectnull/AddMBCategoryMessageSubjectNullTest.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythreadsubjectnull/PostNewMBCategoryThreadSubjectNullTest.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.addmbcategorymessagesubjectnull;
+package com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbcategorythreadsubjectnull;
 
 import com.liferay.portalweb.portal.BaseTestCase;
 import com.liferay.portalweb.portal.util.RuntimeVariables;
@@ -20,8 +20,9 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class AddMBCategoryMessageSubjectNullTest extends BaseTestCase {
-	public void testAddMBCategoryMessageSubjectNull() throws Exception {
+public class PostNewMBCategoryThreadSubjectNullTest extends BaseTestCase {
+	public void testPostNewMBCategoryThreadSubjectNull()
+		throws Exception {
 		selenium.open("/web/guest/home/");
 		loadRequiredJavaScriptModules();
 
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessagebodynull/AddMBCategoryMessageBodyNullTests.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythreadsubjectnull/PostNewMBCategoryThreadSubjectNullTests.html
similarity index 82%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessagebodynull/AddMBCategoryMessageBodyNullTests.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythreadsubjectnull/PostNewMBCategoryThreadSubjectNullTests.html
index 2d48b526f927ef..36dce912dc4a12 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessagebodynull/AddMBCategoryMessageBodyNullTests.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythreadsubjectnull/PostNewMBCategoryThreadSubjectNullTests.html
@@ -3,15 +3,15 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
   <meta content="text/html; charset=UTF-8" http-equiv="content-type" />
-  <title>AddMBCategoryMessageBodyNullTests</title>
+  <title>PostNewMBCategoryThreadSubjectNullTests</title>
 </head>
 <body>
 <table id="suiteTable" cellpadding="1" cellspacing="1" border="1" class="selenium"><tbody>
-<tr><td><b>AddMBCategoryMessageBodyNullTests</b></td></tr>
+<tr><td><b>PostNewMBCategoryThreadSubjectNullTests</b></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPageMBTest.html">AddPageMBTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPortletMBTest.html">AddPortletMBTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/AddMBCategoryTest.html">AddMBCategoryTest</a></td></tr>
-<tr><td><a href="AddMBCategoryMessageBodyNullTest.html">AddMBCategoryMessageBodyNullTest</a></td></tr>
+<tr><td><a href="PostNewMBCategoryThreadSubjectNullTest.html">PostNewMBCategoryThreadSubjectNullTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/TearDownMBCategoryTest.html">TearDownMBCategoryTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portal/util/TearDownPageTest.html">TearDownPageTest</a></td></tr>
 </tbody></table>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessagequestion/AddMBCategoryMessageQuestionTests.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythreadsubjectnull/PostNewMBCategoryThreadSubjectNullTests.java
similarity index 86%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessagequestion/AddMBCategoryMessageQuestionTests.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythreadsubjectnull/PostNewMBCategoryThreadSubjectNullTests.java
index 6924bc8529d0b4..f6fc1fa5c29d78 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessagequestion/AddMBCategoryMessageQuestionTests.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythreadsubjectnull/PostNewMBCategoryThreadSubjectNullTests.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.addmbcategorymessagequestion;
+package com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbcategorythreadsubjectnull;
 
 import com.liferay.portalweb.portal.BaseTestSuite;
 import com.liferay.portalweb.portal.util.TearDownPageTest;
@@ -27,13 +27,13 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class AddMBCategoryMessageQuestionTests extends BaseTestSuite {
+public class PostNewMBCategoryThreadSubjectNullTests extends BaseTestSuite {
 	public static Test suite() {
 		TestSuite testSuite = new TestSuite();
 		testSuite.addTestSuite(AddPageMBTest.class);
 		testSuite.addTestSuite(AddPortletMBTest.class);
 		testSuite.addTestSuite(AddMBCategoryTest.class);
-		testSuite.addTestSuite(AddMBCategoryMessageQuestionTest.class);
+		testSuite.addTestSuite(PostNewMBCategoryThreadSubjectNullTest.class);
 		testSuite.addTestSuite(TearDownMBCategoryTest.class);
 		testSuite.addTestSuite(TearDownPageTest.class);
 
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessageutf8/AddMBCategoryMessageUTF8Test.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythreadutf8/PostNewMBCategoryThreadUTF8Test.html
similarity index 96%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessageutf8/AddMBCategoryMessageUTF8Test.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythreadutf8/PostNewMBCategoryThreadUTF8Test.html
index 365bfbd194375d..12d5526bac171b 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessageutf8/AddMBCategoryMessageUTF8Test.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythreadutf8/PostNewMBCategoryThreadUTF8Test.html
@@ -1,12 +1,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>AddMBCategoryMessageUTF8Test</title>
+<title>PostNewMBCategoryThreadUTF8Test</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3">AddMBCategoryMessageUTF8Test</td></tr>
+<tr><td rowspan="1" colspan="3">PostNewMBCategoryThreadUTF8Test</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessageutf8/AddMBCategoryMessageUTF8Test.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythreadutf8/PostNewMBCategoryThreadUTF8Test.java
similarity index 96%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessageutf8/AddMBCategoryMessageUTF8Test.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythreadutf8/PostNewMBCategoryThreadUTF8Test.java
index 8750520cbabd21..9971024160d6c5 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessageutf8/AddMBCategoryMessageUTF8Test.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythreadutf8/PostNewMBCategoryThreadUTF8Test.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.addmbcategorymessageutf8;
+package com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbcategorythreadutf8;
 
 import com.liferay.portalweb.portal.BaseTestCase;
 import com.liferay.portalweb.portal.util.RuntimeVariables;
@@ -20,8 +20,8 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class AddMBCategoryMessageUTF8Test extends BaseTestCase {
-	public void testAddMBCategoryMessageUTF8() throws Exception {
+public class PostNewMBCategoryThreadUTF8Test extends BaseTestCase {
+	public void testPostNewMBCategoryThreadUTF8() throws Exception {
 		selenium.open("/web/guest/home/");
 		loadRequiredJavaScriptModules();
 
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessageutf8/AddMBCategoryMessageUTF8Tests.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythreadutf8/PostNewMBCategoryThreadUTF8Tests.html
similarity index 84%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessageutf8/AddMBCategoryMessageUTF8Tests.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythreadutf8/PostNewMBCategoryThreadUTF8Tests.html
index e57824d2aa05ef..5849435f4485ea 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessageutf8/AddMBCategoryMessageUTF8Tests.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythreadutf8/PostNewMBCategoryThreadUTF8Tests.html
@@ -3,15 +3,15 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
   <meta content="text/html; charset=UTF-8" http-equiv="content-type" />
-  <title>AddMBCategoryMessageUTF8Tests</title>
+  <title>PostNewMBCategoryThreadUTF8Tests</title>
 </head>
 <body>
 <table id="suiteTable" cellpadding="1" cellspacing="1" border="1" class="selenium"><tbody>
-<tr><td><b>AddMBCategoryMessageUTF8Tests</b></td></tr>
+<tr><td><b>PostNewMBCategoryThreadUTF8Tests</b></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPageMBTest.html">AddPageMBTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPortletMBTest.html">AddPortletMBTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/AddMBCategoryTest.html">AddMBCategoryTest</a></td></tr>
-<tr><td><a href="AddMBCategoryMessageUTF8Test.html">AddMBCategoryMessageUTF8Test</a></td></tr>
+<tr><td><a href="PostNewMBCategoryThreadUTF8Test.html">PostNewMBCategoryThreadUTF8Test</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/TearDownMBCategoryTest.html">TearDownMBCategoryTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portal/util/TearDownPageTest.html">TearDownPageTest</a></td></tr>
 </tbody></table>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessageutf8/AddMBCategoryMessageUTF8Tests.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythreadutf8/PostNewMBCategoryThreadUTF8Tests.java
similarity index 87%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessageutf8/AddMBCategoryMessageUTF8Tests.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythreadutf8/PostNewMBCategoryThreadUTF8Tests.java
index b29a55cbb24949..c0ed2505a0967b 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessageutf8/AddMBCategoryMessageUTF8Tests.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbcategorythreadutf8/PostNewMBCategoryThreadUTF8Tests.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.addmbcategorymessageutf8;
+package com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbcategorythreadutf8;
 
 import com.liferay.portalweb.portal.BaseTestSuite;
 import com.liferay.portalweb.portal.util.TearDownPageTest;
@@ -27,13 +27,13 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class AddMBCategoryMessageUTF8Tests extends BaseTestSuite {
+public class PostNewMBCategoryThreadUTF8Tests extends BaseTestSuite {
 	public static Test suite() {
 		TestSuite testSuite = new TestSuite();
 		testSuite.addTestSuite(AddPageMBTest.class);
 		testSuite.addTestSuite(AddPortletMBTest.class);
 		testSuite.addTestSuite(AddMBCategoryTest.class);
-		testSuite.addTestSuite(AddMBCategoryMessageUTF8Test.class);
+		testSuite.addTestSuite(PostNewMBCategoryThreadUTF8Test.class);
 		testSuite.addTestSuite(TearDownMBCategoryTest.class);
 		testSuite.addTestSuite(TearDownPageTest.class);
 
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbsubcategorymessage/AddMBSubcategoryTest.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbsubcategorythread/AddMBSubcategoryTest.html
similarity index 100%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbsubcategorymessage/AddMBSubcategoryTest.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbsubcategorythread/AddMBSubcategoryTest.html
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbsubcategorymessage/AddMBSubcategoryTest.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbsubcategorythread/AddMBSubcategoryTest.java
similarity index 96%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbsubcategorymessage/AddMBSubcategoryTest.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbsubcategorythread/AddMBSubcategoryTest.java
index a200a228ef398c..ba5f350a2c2b5d 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbsubcategorymessage/AddMBSubcategoryTest.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbsubcategorythread/AddMBSubcategoryTest.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.addmbsubcategorymessage;
+package com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbsubcategorythread;
 
 import com.liferay.portalweb.portal.BaseTestCase;
 import com.liferay.portalweb.portal.util.RuntimeVariables;
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbsubcategorymessage/AddMBSubcategoryMessageTest.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbsubcategorythread/PostNewMBSubcategoryThreadTest.html
similarity index 96%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbsubcategorymessage/AddMBSubcategoryMessageTest.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbsubcategorythread/PostNewMBSubcategoryThreadTest.html
index 3ceba50e609bce..3ca4f9b158b645 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbsubcategorymessage/AddMBSubcategoryMessageTest.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbsubcategorythread/PostNewMBSubcategoryThreadTest.html
@@ -1,12 +1,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>AddMBSubcategoryMessageTest</title>
+<title>PostNewMBSubcategoryThreadTest</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3">AddMBSubcategoryMessageTest</td></tr>
+<tr><td rowspan="1" colspan="3">PostNewMBSubcategoryThreadTest</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbsubcategorymessage/AddMBSubcategoryMessageTest.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbsubcategorythread/PostNewMBSubcategoryThreadTest.java
similarity index 96%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbsubcategorymessage/AddMBSubcategoryMessageTest.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbsubcategorythread/PostNewMBSubcategoryThreadTest.java
index beda018ed22b7c..d37fb74f2635ac 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbsubcategorymessage/AddMBSubcategoryMessageTest.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbsubcategorythread/PostNewMBSubcategoryThreadTest.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.addmbsubcategorymessage;
+package com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbsubcategorythread;
 
 import com.liferay.portalweb.portal.BaseTestCase;
 import com.liferay.portalweb.portal.util.RuntimeVariables;
@@ -20,8 +20,8 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class AddMBSubcategoryMessageTest extends BaseTestCase {
-	public void testAddMBSubcategoryMessage() throws Exception {
+public class PostNewMBSubcategoryThreadTest extends BaseTestCase {
+	public void testPostNewMBSubcategoryThread() throws Exception {
 		selenium.open("/web/guest/home/");
 		loadRequiredJavaScriptModules();
 
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbsubcategorymessage/AddMBSubcategoryMessageTests.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbsubcategorythread/PostNewMBSubcategoryThreadTests.html
similarity index 80%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbsubcategorymessage/AddMBSubcategoryMessageTests.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbsubcategorythread/PostNewMBSubcategoryThreadTests.html
index 6dee815b285bb7..54013212ad986b 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbsubcategorymessage/AddMBSubcategoryMessageTests.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbsubcategorythread/PostNewMBSubcategoryThreadTests.html
@@ -3,17 +3,17 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
   <meta content="text/html; charset=UTF-8" http-equiv="content-type" />
-  <title>AddMBSubcategoryMessageTests</title>
+  <title>PostNewMBSubcategoryThreadTests</title>
 </head>
 <body>
 <table id="suiteTable" cellpadding="1" cellspacing="1" border="1" class="selenium"><tbody>
-<tr><td><b>AddMBSubcategoryMessageTests</b></td></tr>
+<tr><td><b>PostNewMBSubcategoryThreadTests</b></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPageMBTest.html">AddPageMBTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPortletMBTest.html">AddPortletMBTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/AddMBCategoryTest.html">AddMBCategoryTest</a></td></tr>
 <tr><td><a href="AddMBSubcategoryTest.html">AddMBSubcategoryTest</a></td></tr>
-<tr><td><a href="AddMBSubcategoryMessageTest.html">AddMBSubcategoryMessageTest</a></td></tr>
-<tr><td><a href="ViewMBSubcategoryMessageTest.html">ViewMBSubcategoryMessageTest</a></td></tr>
+<tr><td><a href="PostNewMBSubcategoryThreadTest.html">PostNewMBSubcategoryThreadTest</a></td></tr>
+<tr><td><a href="ViewMBSubcategoryThreadTest.html">ViewMBSubcategoryThreadTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/TearDownMBCategoryTest.html">TearDownMBCategoryTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portal/util/TearDownPageTest.html">TearDownPageTest</a></td></tr>
 </tbody></table>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbsubcategorymessage/AddMBSubcategoryMessageTests.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbsubcategorythread/PostNewMBSubcategoryThreadTests.java
similarity index 84%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbsubcategorymessage/AddMBSubcategoryMessageTests.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbsubcategorythread/PostNewMBSubcategoryThreadTests.java
index 7e17c16f5beb3c..4fd0db19f11d1f 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbsubcategorymessage/AddMBSubcategoryMessageTests.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbsubcategorythread/PostNewMBSubcategoryThreadTests.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.addmbsubcategorymessage;
+package com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbsubcategorythread;
 
 import com.liferay.portalweb.portal.BaseTestSuite;
 import com.liferay.portalweb.portal.util.TearDownPageTest;
@@ -27,15 +27,15 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class AddMBSubcategoryMessageTests extends BaseTestSuite {
+public class PostNewMBSubcategoryThreadTests extends BaseTestSuite {
 	public static Test suite() {
 		TestSuite testSuite = new TestSuite();
 		testSuite.addTestSuite(AddPageMBTest.class);
 		testSuite.addTestSuite(AddPortletMBTest.class);
 		testSuite.addTestSuite(AddMBCategoryTest.class);
 		testSuite.addTestSuite(AddMBSubcategoryTest.class);
-		testSuite.addTestSuite(AddMBSubcategoryMessageTest.class);
-		testSuite.addTestSuite(ViewMBSubcategoryMessageTest.class);
+		testSuite.addTestSuite(PostNewMBSubcategoryThreadTest.class);
+		testSuite.addTestSuite(ViewMBSubcategoryThreadTest.class);
 		testSuite.addTestSuite(TearDownMBCategoryTest.class);
 		testSuite.addTestSuite(TearDownPageTest.class);
 
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbsubcategorymessage/ViewMBSubcategoryMessageTest.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbsubcategorythread/ViewMBSubcategoryThreadTest.html
similarity index 94%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbsubcategorymessage/ViewMBSubcategoryMessageTest.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbsubcategorythread/ViewMBSubcategoryThreadTest.html
index a4064939867b82..b63936c619855f 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbsubcategorymessage/ViewMBSubcategoryMessageTest.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbsubcategorythread/ViewMBSubcategoryThreadTest.html
@@ -1,12 +1,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>ViewMBSubcategoryMessageTest</title>
+<title>ViewMBSubcategoryThreadTest</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3">ViewMBSubcategoryMessageTest</td></tr>
+<tr><td rowspan="1" colspan="3">ViewMBSubcategoryThreadTest</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbsubcategorymessage/ViewMBSubcategoryMessageTest.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbsubcategorythread/ViewMBSubcategoryThreadTest.java
similarity index 93%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbsubcategorymessage/ViewMBSubcategoryMessageTest.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbsubcategorythread/ViewMBSubcategoryThreadTest.java
index fc876f58ccf956..08f9edb599aeed 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbsubcategorymessage/ViewMBSubcategoryMessageTest.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbsubcategorythread/ViewMBSubcategoryThreadTest.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.addmbsubcategorymessage;
+package com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbsubcategorythread;
 
 import com.liferay.portalweb.portal.BaseTestCase;
 import com.liferay.portalweb.portal.util.RuntimeVariables;
@@ -20,8 +20,8 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class ViewMBSubcategoryMessageTest extends BaseTestCase {
-	public void testViewMBSubcategoryMessage() throws Exception {
+public class ViewMBSubcategoryThreadTest extends BaseTestCase {
+	public void testViewMBSubcategoryThread() throws Exception {
 		selenium.open("/web/guest/home/");
 		loadRequiredJavaScriptModules();
 
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbsubcategorymessagebodynull/AddMBSubcategoryMessageBodyNullTest.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbsubcategorythreadbodynull/PostNewMBSubcategoryThreadBodyNullTest.html
similarity index 96%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbsubcategorymessagebodynull/AddMBSubcategoryMessageBodyNullTest.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbsubcategorythreadbodynull/PostNewMBSubcategoryThreadBodyNullTest.html
index fec184eecbd834..de9ed5fdd666b7 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbsubcategorymessagebodynull/AddMBSubcategoryMessageBodyNullTest.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbsubcategorythreadbodynull/PostNewMBSubcategoryThreadBodyNullTest.html
@@ -1,12 +1,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>AddMBSubcategoryMessageBodyNullTest</title>
+<title>PostNewMBSubcategoryThreadBodyNullTest</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3">AddMBSubcategoryMessageBodyNullTest</td></tr>
+<tr><td rowspan="1" colspan="3">PostNewMBSubcategoryThreadBodyNullTest</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbsubcategorymessagebodynull/AddMBSubcategoryMessageBodyNullTest.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbsubcategorythreadbodynull/PostNewMBSubcategoryThreadBodyNullTest.java
similarity index 96%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbsubcategorymessagebodynull/AddMBSubcategoryMessageBodyNullTest.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbsubcategorythreadbodynull/PostNewMBSubcategoryThreadBodyNullTest.java
index ba42e345a42385..12e7b0e19e7dbc 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbsubcategorymessagebodynull/AddMBSubcategoryMessageBodyNullTest.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbsubcategorythreadbodynull/PostNewMBSubcategoryThreadBodyNullTest.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.addmbsubcategorymessagebodynull;
+package com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbsubcategorythreadbodynull;
 
 import com.liferay.portalweb.portal.BaseTestCase;
 import com.liferay.portalweb.portal.util.RuntimeVariables;
@@ -20,8 +20,9 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class AddMBSubcategoryMessageBodyNullTest extends BaseTestCase {
-	public void testAddMBSubcategoryMessageBodyNull() throws Exception {
+public class PostNewMBSubcategoryThreadBodyNullTest extends BaseTestCase {
+	public void testPostNewMBSubcategoryThreadBodyNull()
+		throws Exception {
 		selenium.open("/web/guest/home/");
 		loadRequiredJavaScriptModules();
 
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbsubcategorymessagesubjectnull/AddMBSubcategoryMessageSubjectNullTests.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbsubcategorythreadbodynull/PostNewMBSubcategoryThreadBodyNullTests.html
similarity index 77%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbsubcategorymessagesubjectnull/AddMBSubcategoryMessageSubjectNullTests.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbsubcategorythreadbodynull/PostNewMBSubcategoryThreadBodyNullTests.html
index 60bfd94c047c0f..f65c6b84a98045 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbsubcategorymessagesubjectnull/AddMBSubcategoryMessageSubjectNullTests.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbsubcategorythreadbodynull/PostNewMBSubcategoryThreadBodyNullTests.html
@@ -3,16 +3,16 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
   <meta content="text/html; charset=UTF-8" http-equiv="content-type" />
-  <title>AddMBSubcategoryMessageSubjectNullTests</title>
+  <title>PostNewMBSubcategoryThreadBodyNullTests</title>
 </head>
 <body>
 <table id="suiteTable" cellpadding="1" cellspacing="1" border="1" class="selenium"><tbody>
-<tr><td><b>AddMBSubcategoryMessageSubjectNullTests</b></td></tr>
+<tr><td><b>PostNewMBSubcategoryThreadBodyNullTests</b></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPageMBTest.html">AddPageMBTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPortletMBTest.html">AddPortletMBTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/AddMBCategoryTest.html">AddMBCategoryTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/addmbsubcategorymessage/AddMBSubcategoryTest.html">AddMBSubcategoryTest</a></td></tr>
-<tr><td><a href="AddMBSubcategoryMessageSubjectNullTest.html">AddMBSubcategoryMessageSubjectNullTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/postnewmbsubcategorythread/AddMBSubcategoryTest.html">AddMBSubcategoryTest</a></td></tr>
+<tr><td><a href="PostNewMBSubcategoryThreadBodyNullTest.html">PostNewMBSubcategoryThreadBodyNullTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/TearDownMBCategoryTest.html">TearDownMBCategoryTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portal/util/TearDownPageTest.html">TearDownPageTest</a></td></tr>
 </tbody></table>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbsubcategorymessagesubjectnull/AddMBSubcategoryMessageSubjectNullTests.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbsubcategorythreadbodynull/PostNewMBSubcategoryThreadBodyNullTests.java
similarity index 82%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbsubcategorymessagesubjectnull/AddMBSubcategoryMessageSubjectNullTests.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbsubcategorythreadbodynull/PostNewMBSubcategoryThreadBodyNullTests.java
index 2b62832e5d0534..b9ed57b8d0523b 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbsubcategorymessagesubjectnull/AddMBSubcategoryMessageSubjectNullTests.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbsubcategorythreadbodynull/PostNewMBSubcategoryThreadBodyNullTests.java
@@ -12,13 +12,13 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.addmbsubcategorymessagesubjectnull;
+package com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbsubcategorythreadbodynull;
 
 import com.liferay.portalweb.portal.BaseTestSuite;
 import com.liferay.portalweb.portal.util.TearDownPageTest;
 import com.liferay.portalweb.portlet.messageboards.mbcategory.addmbcategory.AddMBCategoryTest;
 import com.liferay.portalweb.portlet.messageboards.mbcategory.addmbcategory.TearDownMBCategoryTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.addmbsubcategorymessage.AddMBSubcategoryTest;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbsubcategorythread.AddMBSubcategoryTest;
 import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPageMBTest;
 import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPortletMBTest;
 
@@ -28,14 +28,14 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class AddMBSubcategoryMessageSubjectNullTests extends BaseTestSuite {
+public class PostNewMBSubcategoryThreadBodyNullTests extends BaseTestSuite {
 	public static Test suite() {
 		TestSuite testSuite = new TestSuite();
 		testSuite.addTestSuite(AddPageMBTest.class);
 		testSuite.addTestSuite(AddPortletMBTest.class);
 		testSuite.addTestSuite(AddMBCategoryTest.class);
 		testSuite.addTestSuite(AddMBSubcategoryTest.class);
-		testSuite.addTestSuite(AddMBSubcategoryMessageSubjectNullTest.class);
+		testSuite.addTestSuite(PostNewMBSubcategoryThreadBodyNullTest.class);
 		testSuite.addTestSuite(TearDownMBCategoryTest.class);
 		testSuite.addTestSuite(TearDownPageTest.class);
 
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbsubcategorymessagemultiple/AddMBSubcategoryMessage1Test.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbsubcategorythreads/PostNewMBSubcategoryThread1Test.html
similarity index 96%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbsubcategorymessagemultiple/AddMBSubcategoryMessage1Test.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbsubcategorythreads/PostNewMBSubcategoryThread1Test.html
index d0e0abd02bc69b..0abee27d3edced 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbsubcategorymessagemultiple/AddMBSubcategoryMessage1Test.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbsubcategorythreads/PostNewMBSubcategoryThread1Test.html
@@ -1,12 +1,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>AddMBSubcategoryMessage1Test</title>
+<title>PostNewMBSubcategoryThread1Test</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3">AddMBSubcategoryMessage1Test</td></tr>
+<tr><td rowspan="1" colspan="3">PostNewMBSubcategoryThread1Test</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbsubcategorymessagemultiple/AddMBSubcategoryMessage1Test.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbsubcategorythreads/PostNewMBSubcategoryThread1Test.java
similarity index 96%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbsubcategorymessagemultiple/AddMBSubcategoryMessage1Test.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbsubcategorythreads/PostNewMBSubcategoryThread1Test.java
index 069838189fa955..4bfed00a9bcbfc 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbsubcategorymessagemultiple/AddMBSubcategoryMessage1Test.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbsubcategorythreads/PostNewMBSubcategoryThread1Test.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.addmbsubcategorymessagemultiple;
+package com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbsubcategorythreads;
 
 import com.liferay.portalweb.portal.BaseTestCase;
 import com.liferay.portalweb.portal.util.RuntimeVariables;
@@ -20,8 +20,8 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class AddMBSubcategoryMessage1Test extends BaseTestCase {
-	public void testAddMBSubcategoryMessage1() throws Exception {
+public class PostNewMBSubcategoryThread1Test extends BaseTestCase {
+	public void testPostNewMBSubcategoryThread1() throws Exception {
 		selenium.open("/web/guest/home/");
 		loadRequiredJavaScriptModules();
 
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbsubcategorymessagemultiple/AddMBSubcategoryMessage2Test.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbsubcategorythreads/PostNewMBSubcategoryThread2Test.html
similarity index 96%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbsubcategorymessagemultiple/AddMBSubcategoryMessage2Test.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbsubcategorythreads/PostNewMBSubcategoryThread2Test.html
index 42958af18939f4..e473fea49352b4 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbsubcategorymessagemultiple/AddMBSubcategoryMessage2Test.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbsubcategorythreads/PostNewMBSubcategoryThread2Test.html
@@ -1,12 +1,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>AddMBSubcategoryMessage2Test</title>
+<title>PostNewMBSubcategoryThread2Test</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3">AddMBSubcategoryMessage2Test</td></tr>
+<tr><td rowspan="1" colspan="3">PostNewMBSubcategoryThread2Test</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbsubcategorymessagemultiple/AddMBSubcategoryMessage2Test.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbsubcategorythreads/PostNewMBSubcategoryThread2Test.java
similarity index 96%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbsubcategorymessagemultiple/AddMBSubcategoryMessage2Test.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbsubcategorythreads/PostNewMBSubcategoryThread2Test.java
index 74501e62fe0edd..f4b15c5c1c9aef 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbsubcategorymessagemultiple/AddMBSubcategoryMessage2Test.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbsubcategorythreads/PostNewMBSubcategoryThread2Test.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.addmbsubcategorymessagemultiple;
+package com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbsubcategorythreads;
 
 import com.liferay.portalweb.portal.BaseTestCase;
 import com.liferay.portalweb.portal.util.RuntimeVariables;
@@ -20,8 +20,8 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class AddMBSubcategoryMessage2Test extends BaseTestCase {
-	public void testAddMBSubcategoryMessage2() throws Exception {
+public class PostNewMBSubcategoryThread2Test extends BaseTestCase {
+	public void testPostNewMBSubcategoryThread2() throws Exception {
 		selenium.open("/web/guest/home/");
 		loadRequiredJavaScriptModules();
 
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbsubcategorymessagemultiple/AddMBSubcategoryMessage3Test.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbsubcategorythreads/PostNewMBSubcategoryThread3Test.html
similarity index 96%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbsubcategorymessagemultiple/AddMBSubcategoryMessage3Test.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbsubcategorythreads/PostNewMBSubcategoryThread3Test.html
index b48fc89216a18b..36272ac1987e0b 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbsubcategorymessagemultiple/AddMBSubcategoryMessage3Test.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbsubcategorythreads/PostNewMBSubcategoryThread3Test.html
@@ -1,12 +1,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>AddMBSubcategoryMessage3Test</title>
+<title>PostNewMBSubcategoryThread3Test</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3">AddMBSubcategoryMessage3Test</td></tr>
+<tr><td rowspan="1" colspan="3">PostNewMBSubcategoryThread3Test</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbsubcategorymessagemultiple/AddMBSubcategoryMessage3Test.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbsubcategorythreads/PostNewMBSubcategoryThread3Test.java
similarity index 96%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbsubcategorymessagemultiple/AddMBSubcategoryMessage3Test.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbsubcategorythreads/PostNewMBSubcategoryThread3Test.java
index 630ad78961f560..74d70c37f3af7c 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbsubcategorymessagemultiple/AddMBSubcategoryMessage3Test.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbsubcategorythreads/PostNewMBSubcategoryThread3Test.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.addmbsubcategorymessagemultiple;
+package com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbsubcategorythreads;
 
 import com.liferay.portalweb.portal.BaseTestCase;
 import com.liferay.portalweb.portal.util.RuntimeVariables;
@@ -20,8 +20,8 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class AddMBSubcategoryMessage3Test extends BaseTestCase {
-	public void testAddMBSubcategoryMessage3() throws Exception {
+public class PostNewMBSubcategoryThread3Test extends BaseTestCase {
+	public void testPostNewMBSubcategoryThread3() throws Exception {
 		selenium.open("/web/guest/home/");
 		loadRequiredJavaScriptModules();
 
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessagereply/AddMBCategoryMessageReplyTests.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbsubcategorythreads/PostNewMBSubcategoryThreadsTests.html
similarity index 69%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessagereply/AddMBCategoryMessageReplyTests.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbsubcategorythreads/PostNewMBSubcategoryThreadsTests.html
index 8bf675517d4ebb..8f71de6d326701 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessagereply/AddMBCategoryMessageReplyTests.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbsubcategorythreads/PostNewMBSubcategoryThreadsTests.html
@@ -3,17 +3,18 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
   <meta content="text/html; charset=UTF-8" http-equiv="content-type" />
-  <title>AddMBCategoryMessageReplyTests</title>
+  <title>PostNewMBSubcategoryThreadsTests</title>
 </head>
 <body>
 <table id="suiteTable" cellpadding="1" cellspacing="1" border="1" class="selenium"><tbody>
-<tr><td><b>AddMBCategoryMessageReplyTests</b></td></tr>
+<tr><td><b>PostNewMBSubcategoryThreadsTests</b></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPageMBTest.html">AddPageMBTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPortletMBTest.html">AddPortletMBTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/AddMBCategoryTest.html">AddMBCategoryTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThreadMessageTest.html">PostNewMBCategoryThreadMessageTest</a></td></tr>
-<tr><td><a href="AddMBCategoryMessageReplyTest.html">AddMBCategoryMessageReplyTest</a></td></tr>
-<tr><td><a href="ViewMBCategoryMessageReplyTest.html">ViewMBCategoryMessageReplyTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/postnewmbsubcategorythread/AddMBSubcategoryTest.html">AddMBSubcategoryTest</a></td></tr>
+<tr><td><a href="PostNewMBSubcategoryThread1Test.html">PostNewMBSubcategoryThread1Test</a></td></tr>
+<tr><td><a href="PostNewMBSubcategoryThread2Test.html">PostNewMBSubcategoryThread2Test</a></td></tr>
+<tr><td><a href="PostNewMBSubcategoryThread3Test.html">PostNewMBSubcategoryThread3Test</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/TearDownMBCategoryTest.html">TearDownMBCategoryTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portal/util/TearDownPageTest.html">TearDownPageTest</a></td></tr>
 </tbody></table>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbsubcategorymessagemultiple/AddMBSubcategoryMessageMultipleTests.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbsubcategorythreads/PostNewMBSubcategoryThreadsTests.java
similarity index 77%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbsubcategorymessagemultiple/AddMBSubcategoryMessageMultipleTests.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbsubcategorythreads/PostNewMBSubcategoryThreadsTests.java
index 5143ebea737665..4d11c695cfdc80 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbsubcategorymessagemultiple/AddMBSubcategoryMessageMultipleTests.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbsubcategorythreads/PostNewMBSubcategoryThreadsTests.java
@@ -12,13 +12,13 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.addmbsubcategorymessagemultiple;
+package com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbsubcategorythreads;
 
 import com.liferay.portalweb.portal.BaseTestSuite;
 import com.liferay.portalweb.portal.util.TearDownPageTest;
 import com.liferay.portalweb.portlet.messageboards.mbcategory.addmbcategory.AddMBCategoryTest;
 import com.liferay.portalweb.portlet.messageboards.mbcategory.addmbcategory.TearDownMBCategoryTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.addmbsubcategorymessage.AddMBSubcategoryTest;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbsubcategorythread.AddMBSubcategoryTest;
 import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPageMBTest;
 import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPortletMBTest;
 
@@ -28,16 +28,16 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class AddMBSubcategoryMessageMultipleTests extends BaseTestSuite {
+public class PostNewMBSubcategoryThreadsTests extends BaseTestSuite {
 	public static Test suite() {
 		TestSuite testSuite = new TestSuite();
 		testSuite.addTestSuite(AddPageMBTest.class);
 		testSuite.addTestSuite(AddPortletMBTest.class);
 		testSuite.addTestSuite(AddMBCategoryTest.class);
 		testSuite.addTestSuite(AddMBSubcategoryTest.class);
-		testSuite.addTestSuite(AddMBSubcategoryMessage1Test.class);
-		testSuite.addTestSuite(AddMBSubcategoryMessage2Test.class);
-		testSuite.addTestSuite(AddMBSubcategoryMessage3Test.class);
+		testSuite.addTestSuite(PostNewMBSubcategoryThread1Test.class);
+		testSuite.addTestSuite(PostNewMBSubcategoryThread2Test.class);
+		testSuite.addTestSuite(PostNewMBSubcategoryThread3Test.class);
 		testSuite.addTestSuite(TearDownMBCategoryTest.class);
 		testSuite.addTestSuite(TearDownPageTest.class);
 
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbsubcategorymessagesubjectnull/AddMBSubcategoryMessageSubjectNullTest.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbsubcategorythreadsubjectnull/PostNewMBSubcategoryThreadSubjectNullTest.html
similarity index 96%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbsubcategorymessagesubjectnull/AddMBSubcategoryMessageSubjectNullTest.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbsubcategorythreadsubjectnull/PostNewMBSubcategoryThreadSubjectNullTest.html
index 5a92ff9d239206..01b62831bf9198 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbsubcategorymessagesubjectnull/AddMBSubcategoryMessageSubjectNullTest.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbsubcategorythreadsubjectnull/PostNewMBSubcategoryThreadSubjectNullTest.html
@@ -1,12 +1,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>AddMBSubcategoryMessageSubjectNullTest</title>
+<title>PostNewMBSubcategoryThreadSubjectNullTest</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3">AddMBSubcategoryMessageSubjectNullTest</td></tr>
+<tr><td rowspan="1" colspan="3">PostNewMBSubcategoryThreadSubjectNullTest</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbsubcategorymessagesubjectnull/AddMBSubcategoryMessageSubjectNullTest.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbsubcategorythreadsubjectnull/PostNewMBSubcategoryThreadSubjectNullTest.java
similarity index 96%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbsubcategorymessagesubjectnull/AddMBSubcategoryMessageSubjectNullTest.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbsubcategorythreadsubjectnull/PostNewMBSubcategoryThreadSubjectNullTest.java
index b503108f9ad834..b3541beb4071d3 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbsubcategorymessagesubjectnull/AddMBSubcategoryMessageSubjectNullTest.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbsubcategorythreadsubjectnull/PostNewMBSubcategoryThreadSubjectNullTest.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.addmbsubcategorymessagesubjectnull;
+package com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbsubcategorythreadsubjectnull;
 
 import com.liferay.portalweb.portal.BaseTestCase;
 import com.liferay.portalweb.portal.util.RuntimeVariables;
@@ -20,8 +20,8 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class AddMBSubcategoryMessageSubjectNullTest extends BaseTestCase {
-	public void testAddMBSubcategoryMessageSubjectNull()
+public class PostNewMBSubcategoryThreadSubjectNullTest extends BaseTestCase {
+	public void testPostNewMBSubcategoryThreadSubjectNull()
 		throws Exception {
 		selenium.open("/web/guest/home/");
 		loadRequiredJavaScriptModules();
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbsubcategorythreadsubjectnull/PostNewMBSubcategoryThreadSubjectNullTests.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbsubcategorythreadsubjectnull/PostNewMBSubcategoryThreadSubjectNullTests.html
new file mode 100644
index 00000000000000..07d7225e6abd34
--- /dev/null
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbsubcategorythreadsubjectnull/PostNewMBSubcategoryThreadSubjectNullTests.html
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+  <meta content="text/html; charset=UTF-8" http-equiv="content-type" />
+  <title>PostNewMBSubcategoryThreadSubjectNullTests</title>
+</head>
+<body>
+<table id="suiteTable" cellpadding="1" cellspacing="1" border="1" class="selenium"><tbody>
+<tr><td><b>PostNewMBSubcategoryThreadSubjectNullTests</b></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPageMBTest.html">AddPageMBTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPortletMBTest.html">AddPortletMBTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/AddMBCategoryTest.html">AddMBCategoryTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/postnewmbsubcategorythread/AddMBSubcategoryTest.html">AddMBSubcategoryTest</a></td></tr>
+<tr><td><a href="PostNewMBSubcategoryThreadSubjectNullTest.html">PostNewMBSubcategoryThreadSubjectNullTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/TearDownMBCategoryTest.html">TearDownMBCategoryTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portal/util/TearDownPageTest.html">TearDownPageTest</a></td></tr>
+</tbody></table>
+</body>
+</html>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbsubcategorymessagebodynull/AddMBSubcategoryMessageBodyNullTests.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbsubcategorythreadsubjectnull/PostNewMBSubcategoryThreadSubjectNullTests.java
similarity index 81%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbsubcategorymessagebodynull/AddMBSubcategoryMessageBodyNullTests.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbsubcategorythreadsubjectnull/PostNewMBSubcategoryThreadSubjectNullTests.java
index 0af1a332279352..c14508d21b1a3b 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbsubcategorymessagebodynull/AddMBSubcategoryMessageBodyNullTests.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbsubcategorythreadsubjectnull/PostNewMBSubcategoryThreadSubjectNullTests.java
@@ -12,13 +12,13 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.addmbsubcategorymessagebodynull;
+package com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbsubcategorythreadsubjectnull;
 
 import com.liferay.portalweb.portal.BaseTestSuite;
 import com.liferay.portalweb.portal.util.TearDownPageTest;
 import com.liferay.portalweb.portlet.messageboards.mbcategory.addmbcategory.AddMBCategoryTest;
 import com.liferay.portalweb.portlet.messageboards.mbcategory.addmbcategory.TearDownMBCategoryTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.addmbsubcategorymessage.AddMBSubcategoryTest;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbsubcategorythread.AddMBSubcategoryTest;
 import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPageMBTest;
 import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPortletMBTest;
 
@@ -28,14 +28,14 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class AddMBSubcategoryMessageBodyNullTests extends BaseTestSuite {
+public class PostNewMBSubcategoryThreadSubjectNullTests extends BaseTestSuite {
 	public static Test suite() {
 		TestSuite testSuite = new TestSuite();
 		testSuite.addTestSuite(AddPageMBTest.class);
 		testSuite.addTestSuite(AddPortletMBTest.class);
 		testSuite.addTestSuite(AddMBCategoryTest.class);
 		testSuite.addTestSuite(AddMBSubcategoryTest.class);
-		testSuite.addTestSuite(AddMBSubcategoryMessageBodyNullTest.class);
+		testSuite.addTestSuite(PostNewMBSubcategoryThreadSubjectNullTest.class);
 		testSuite.addTestSuite(TearDownMBCategoryTest.class);
 		testSuite.addTestSuite(TearDownPageTest.class);
 
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbthreadmessage/PostNewMBThread1MessageTest.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbthread/PostNewMBThread1Test.html
similarity index 95%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbthreadmessage/PostNewMBThread1MessageTest.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbthread/PostNewMBThread1Test.html
index 3cc1cc6b0f10e6..a6633145f28fc3 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbthreadmessage/PostNewMBThread1MessageTest.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbthread/PostNewMBThread1Test.html
@@ -1,12 +1,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>PostNewMBThread1MessageTest</title>
+<title>PostNewMBThread1Test</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3">PostNewMBThread1MessageTest</td></tr>
+<tr><td rowspan="1" colspan="3">PostNewMBThread1Test</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbthreadmessage/PostNewMBThread1MessageTest.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbthread/PostNewMBThread1Test.java
similarity index 95%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbthreadmessage/PostNewMBThread1MessageTest.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbthread/PostNewMBThread1Test.java
index 81e77c9cebcb7a..51dc29ea3b4e23 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbthreadmessage/PostNewMBThread1MessageTest.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbthread/PostNewMBThread1Test.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbthreadmessage;
+package com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbthread;
 
 import com.liferay.portalweb.portal.BaseTestCase;
 import com.liferay.portalweb.portal.util.RuntimeVariables;
@@ -20,8 +20,8 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class PostNewMBThread1MessageTest extends BaseTestCase {
-	public void testPostNewMBThread1Message() throws Exception {
+public class PostNewMBThread1Test extends BaseTestCase {
+	public void testPostNewMBThread1() throws Exception {
 		selenium.open("/web/guest/home/");
 		loadRequiredJavaScriptModules();
 
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbthreadmessage/PostNewMBThread2MessageTest.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbthread/PostNewMBThread2Test.html
similarity index 95%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbthreadmessage/PostNewMBThread2MessageTest.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbthread/PostNewMBThread2Test.html
index 2172df57d53181..31d14f2bdef388 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbthreadmessage/PostNewMBThread2MessageTest.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbthread/PostNewMBThread2Test.html
@@ -1,12 +1,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>PostNewMBThread2MessageTest</title>
+<title>PostNewMBThread2Test</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3">PostNewMBThread2MessageTest</td></tr>
+<tr><td rowspan="1" colspan="3">PostNewMBThread2Test</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbthreadmessage/PostNewMBThread2MessageTest.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbthread/PostNewMBThread2Test.java
similarity index 95%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbthreadmessage/PostNewMBThread2MessageTest.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbthread/PostNewMBThread2Test.java
index bf9670b0b4319d..c11358db8a7d80 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbthreadmessage/PostNewMBThread2MessageTest.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbthread/PostNewMBThread2Test.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbthreadmessage;
+package com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbthread;
 
 import com.liferay.portalweb.portal.BaseTestCase;
 import com.liferay.portalweb.portal.util.RuntimeVariables;
@@ -20,8 +20,8 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class PostNewMBThread2MessageTest extends BaseTestCase {
-	public void testPostNewMBThread2Message() throws Exception {
+public class PostNewMBThread2Test extends BaseTestCase {
+	public void testPostNewMBThread2() throws Exception {
 		selenium.open("/web/guest/home/");
 		loadRequiredJavaScriptModules();
 
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbthreadmessage/PostNewMBThread3MessageTest.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbthread/PostNewMBThread3Test.html
similarity index 95%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbthreadmessage/PostNewMBThread3MessageTest.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbthread/PostNewMBThread3Test.html
index 766df1a5acd668..25ad89420cb98c 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbthreadmessage/PostNewMBThread3MessageTest.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbthread/PostNewMBThread3Test.html
@@ -1,12 +1,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>PostNewMBThread3MessageTest</title>
+<title>PostNewMBThread3Test</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3">PostNewMBThread3MessageTest</td></tr>
+<tr><td rowspan="1" colspan="3">PostNewMBThread3Test</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbthreadmessage/PostNewMBThread3MessageTest.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbthread/PostNewMBThread3Test.java
similarity index 95%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbthreadmessage/PostNewMBThread3MessageTest.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbthread/PostNewMBThread3Test.java
index 01993d597bff39..1fe87106b51da8 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbthreadmessage/PostNewMBThread3MessageTest.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbthread/PostNewMBThread3Test.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbthreadmessage;
+package com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbthread;
 
 import com.liferay.portalweb.portal.BaseTestCase;
 import com.liferay.portalweb.portal.util.RuntimeVariables;
@@ -20,8 +20,8 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class PostNewMBThread3MessageTest extends BaseTestCase {
-	public void testPostNewMBThread3Message() throws Exception {
+public class PostNewMBThread3Test extends BaseTestCase {
+	public void testPostNewMBThread3() throws Exception {
 		selenium.open("/web/guest/home/");
 		loadRequiredJavaScriptModules();
 
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbthreadmessage/PostNewMBThreadMessageTest.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbthread/PostNewMBThreadTest.html
similarity index 95%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbthreadmessage/PostNewMBThreadMessageTest.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbthread/PostNewMBThreadTest.html
index 5d2c878556ccfa..4451d9fd021113 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbthreadmessage/PostNewMBThreadMessageTest.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbthread/PostNewMBThreadTest.html
@@ -1,12 +1,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>PostNewMBThreadMessageTest</title>
+<title>PostNewMBThreadTest</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3">PostNewMBThreadMessageTest</td></tr>
+<tr><td rowspan="1" colspan="3">PostNewMBThreadTest</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbthreadmessage/PostNewMBThreadMessageTest.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbthread/PostNewMBThreadTest.java
similarity index 95%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbthreadmessage/PostNewMBThreadMessageTest.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbthread/PostNewMBThreadTest.java
index b90999373dd865..97b48ea637946f 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbthreadmessage/PostNewMBThreadMessageTest.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbthread/PostNewMBThreadTest.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbthreadmessage;
+package com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbthread;
 
 import com.liferay.portalweb.portal.BaseTestCase;
 import com.liferay.portalweb.portal.util.RuntimeVariables;
@@ -20,8 +20,8 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class PostNewMBThreadMessageTest extends BaseTestCase {
-	public void testPostNewMBThreadMessage() throws Exception {
+public class PostNewMBThreadTest extends BaseTestCase {
+	public void testPostNewMBThread() throws Exception {
 		selenium.open("/web/guest/home/");
 		loadRequiredJavaScriptModules();
 		selenium.clickAt("link=Message Boards Test Page",
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbthreadmessage/PostNewMBThreadMessageTests.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbthread/PostNewMBThreadTests.html
similarity index 84%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbthreadmessage/PostNewMBThreadMessageTests.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbthread/PostNewMBThreadTests.html
index 8b2a40c8216e0a..c99af391045497 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbthreadmessage/PostNewMBThreadMessageTests.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbthread/PostNewMBThreadTests.html
@@ -10,8 +10,8 @@
 <tr><td><b>Test Suite</b></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPageMBTest.html">AddPageMBTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPortletMBTest.html">AddPortletMBTest</a></td></tr>
-<tr><td><a href="PostNewMBThreadMessageTest.html">PostNewMBThreadMessageTest</a></td></tr>
-<tr><td><a href="ViewMBThreadMessageTest.html">ViewMBThreadMessageTest</a></td></tr>
+<tr><td><a href="PostNewMBThreadTest.html">PostNewMBThreadTest</a></td></tr>
+<tr><td><a href="ViewMBThreadTest.html">ViewMBThreadTest</a></td></tr>
 <tr><td><a href="TearDownMBThreadTest.html">TearDownMBThreadTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portal/util/TearDownPageTest.html">TearDownPageTest</a></td></tr>
 </tbody></table>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbmessage/AddMBMessageTests.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbthread/PostNewMBThreadTests.java
similarity index 81%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbmessage/AddMBMessageTests.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbthread/PostNewMBThreadTests.java
index 4debfdc06c95cc..46c60cc7d08c4e 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbmessage/AddMBMessageTests.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbthread/PostNewMBThreadTests.java
@@ -12,11 +12,10 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.addmbmessage;
+package com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbthread;
 
 import com.liferay.portalweb.portal.BaseTestSuite;
 import com.liferay.portalweb.portal.util.TearDownPageTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbthreadmessage.TearDownMBThreadTest;
 import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPageMBTest;
 import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPortletMBTest;
 
@@ -26,12 +25,13 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class AddMBMessageTests extends BaseTestSuite {
+public class PostNewMBThreadTests extends BaseTestSuite {
 	public static Test suite() {
 		TestSuite testSuite = new TestSuite();
 		testSuite.addTestSuite(AddPageMBTest.class);
 		testSuite.addTestSuite(AddPortletMBTest.class);
-		testSuite.addTestSuite(AddMBMessageTest.class);
+		testSuite.addTestSuite(PostNewMBThreadTest.class);
+		testSuite.addTestSuite(ViewMBThreadTest.class);
 		testSuite.addTestSuite(TearDownMBThreadTest.class);
 		testSuite.addTestSuite(TearDownPageTest.class);
 
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbthreadmessage/TearDownMBThreadTest.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbthread/TearDownMBThreadTest.html
similarity index 100%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbthreadmessage/TearDownMBThreadTest.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbthread/TearDownMBThreadTest.html
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbthreadmessage/TearDownMBThreadTest.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbthread/TearDownMBThreadTest.java
similarity index 98%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbthreadmessage/TearDownMBThreadTest.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbthread/TearDownMBThreadTest.java
index b760e9cb7db2dc..1ace57c926a299 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbthreadmessage/TearDownMBThreadTest.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbthread/TearDownMBThreadTest.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbthreadmessage;
+package com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbthread;
 
 import com.liferay.portalweb.portal.BaseTestCase;
 import com.liferay.portalweb.portal.util.RuntimeVariables;
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbthreadmessage/ViewMBThreadMessageTest.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbthread/ViewMBThreadTest.html
similarity index 93%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbthreadmessage/ViewMBThreadMessageTest.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbthread/ViewMBThreadTest.html
index 7312e493dc0d2f..5a6714ad09b3e5 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbthreadmessage/ViewMBThreadMessageTest.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbthread/ViewMBThreadTest.html
@@ -1,12 +1,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>ViewMBThreadMessageTest</title>
+<title>ViewMBThreadTest</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3">ViewMBThreadMessageTest</td></tr>
+<tr><td rowspan="1" colspan="3">ViewMBThreadTest</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbthreadmessage/ViewMBThreadMessageTest.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbthread/ViewMBThreadTest.java
similarity index 92%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbthreadmessage/ViewMBThreadMessageTest.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbthread/ViewMBThreadTest.java
index ce8ad292d445bd..d4b0e7619d29d8 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbthreadmessage/ViewMBThreadMessageTest.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbthread/ViewMBThreadTest.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbthreadmessage;
+package com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbthread;
 
 import com.liferay.portalweb.portal.BaseTestCase;
 import com.liferay.portalweb.portal.util.RuntimeVariables;
@@ -20,8 +20,8 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class ViewMBThreadMessageTest extends BaseTestCase {
-	public void testViewMBThreadMessage() throws Exception {
+public class ViewMBThreadTest extends BaseTestCase {
+	public void testViewMBThread() throws Exception {
 		selenium.open("/web/guest/home/");
 		loadRequiredJavaScriptModules();
 		selenium.clickAt("link=Message Boards Test Page",
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbthreads/PostNewMBThreadsTests.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbthreads/PostNewMBThreadsTests.html
new file mode 100644
index 00000000000000..78e59d18a0745b
--- /dev/null
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbthreads/PostNewMBThreadsTests.html
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+  <meta content="text/html; charset=UTF-8" http-equiv="content-type" />
+  <title>Test Suite</title>
+</head>
+<body>
+<table id="suiteTable" cellpadding="1" cellspacing="1" border="1" class="selenium"><tbody>
+<tr><td><b>Test Suite</b></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPageMBTest.html">AddPageMBTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPortletMBTest.html">AddPortletMBTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/postnewmbthread/PostNewMBThread1Test.html">PostNewMBThread1Test</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/postnewmbthread/PostNewMBThread2Test.html">PostNewMBThread2Test</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/postnewmbthread/PostNewMBThread3Test.html">PostNewMBThread3Test</a></td></tr>
+<tr><td><a href="ViewMBThread1Test.html">ViewMBThread1Test</a></td></tr>
+<tr><td><a href="ViewMBThread2Test.html">ViewMBThread2Test</a></td></tr>
+<tr><td><a href="ViewMBThread3Test.html">ViewMBThread3Test</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/postnewmbthread/TearDownMBThreadTest.html">TearDownMBThreadTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portal/util/TearDownPageTest.html">TearDownPageTest</a></td></tr>
+</tbody></table>
+</body>
+</html>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbthreads/PostNewMBThreadsTests.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbthreads/PostNewMBThreadsTests.java
new file mode 100644
index 00000000000000..83dd6619c49c31
--- /dev/null
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbthreads/PostNewMBThreadsTests.java
@@ -0,0 +1,48 @@
+/**
+ * Copyright (c) 2000-2012 Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbthreads;
+
+import com.liferay.portalweb.portal.BaseTestSuite;
+import com.liferay.portalweb.portal.util.TearDownPageTest;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbthread.PostNewMBThread1Test;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbthread.PostNewMBThread2Test;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbthread.PostNewMBThread3Test;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbthread.TearDownMBThreadTest;
+import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPageMBTest;
+import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPortletMBTest;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+/**
+ * @author Brian Wing Shun Chan
+ */
+public class PostNewMBThreadsTests extends BaseTestSuite {
+	public static Test suite() {
+		TestSuite testSuite = new TestSuite();
+		testSuite.addTestSuite(AddPageMBTest.class);
+		testSuite.addTestSuite(AddPortletMBTest.class);
+		testSuite.addTestSuite(PostNewMBThread1Test.class);
+		testSuite.addTestSuite(PostNewMBThread2Test.class);
+		testSuite.addTestSuite(PostNewMBThread3Test.class);
+		testSuite.addTestSuite(ViewMBThread1Test.class);
+		testSuite.addTestSuite(ViewMBThread2Test.class);
+		testSuite.addTestSuite(ViewMBThread3Test.class);
+		testSuite.addTestSuite(TearDownMBThreadTest.class);
+		testSuite.addTestSuite(TearDownPageTest.class);
+
+		return testSuite;
+	}
+}
\ No newline at end of file
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbthreadsmessage/ViewMBThread1MessageTest.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbthreads/ViewMBThread1Test.html
similarity index 93%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbthreadsmessage/ViewMBThread1MessageTest.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbthreads/ViewMBThread1Test.html
index 3281bcbfddcabe..862f6c28090c39 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbthreadsmessage/ViewMBThread1MessageTest.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbthreads/ViewMBThread1Test.html
@@ -1,12 +1,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>ViewMBThread1MessageTest</title>
+<title>ViewMBThread1Test</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3">ViewMBThread1MessageTest</td></tr>
+<tr><td rowspan="1" colspan="3">ViewMBThread1Test</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbthreadsmessage/ViewMBThread1MessageTest.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbthreads/ViewMBThread1Test.java
similarity index 92%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbthreadsmessage/ViewMBThread1MessageTest.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbthreads/ViewMBThread1Test.java
index 9ae04cdaf9acf0..6cb0715b1ffa4d 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbthreadsmessage/ViewMBThread1MessageTest.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbthreads/ViewMBThread1Test.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbthreadsmessage;
+package com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbthreads;
 
 import com.liferay.portalweb.portal.BaseTestCase;
 import com.liferay.portalweb.portal.util.RuntimeVariables;
@@ -20,8 +20,8 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class ViewMBThread1MessageTest extends BaseTestCase {
-	public void testViewMBThread1Message() throws Exception {
+public class ViewMBThread1Test extends BaseTestCase {
+	public void testViewMBThread1() throws Exception {
 		selenium.open("/web/guest/home/");
 		loadRequiredJavaScriptModules();
 		selenium.clickAt("link=Message Boards Test Page",
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbthreadsmessage/ViewMBThread2MessageTest.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbthreads/ViewMBThread2Test.html
similarity index 93%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbthreadsmessage/ViewMBThread2MessageTest.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbthreads/ViewMBThread2Test.html
index 7ae90ef9079daf..b1bf25bfb2ff0b 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbthreadsmessage/ViewMBThread2MessageTest.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbthreads/ViewMBThread2Test.html
@@ -1,12 +1,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>ViewMBThread2MessageTest</title>
+<title>ViewMBThread2Test</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3">ViewMBThread2MessageTest</td></tr>
+<tr><td rowspan="1" colspan="3">ViewMBThread2Test</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbthreadsmessage/ViewMBThread2MessageTest.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbthreads/ViewMBThread2Test.java
similarity index 92%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbthreadsmessage/ViewMBThread2MessageTest.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbthreads/ViewMBThread2Test.java
index 9cee75dd278df4..d27b112b4caa5d 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbthreadsmessage/ViewMBThread2MessageTest.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbthreads/ViewMBThread2Test.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbthreadsmessage;
+package com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbthreads;
 
 import com.liferay.portalweb.portal.BaseTestCase;
 import com.liferay.portalweb.portal.util.RuntimeVariables;
@@ -20,8 +20,8 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class ViewMBThread2MessageTest extends BaseTestCase {
-	public void testViewMBThread2Message() throws Exception {
+public class ViewMBThread2Test extends BaseTestCase {
+	public void testViewMBThread2() throws Exception {
 		selenium.open("/web/guest/home/");
 		loadRequiredJavaScriptModules();
 		selenium.clickAt("link=Message Boards Test Page",
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbthreadsmessage/ViewMBThread3MessageTest.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbthreads/ViewMBThread3Test.html
similarity index 93%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbthreadsmessage/ViewMBThread3MessageTest.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbthreads/ViewMBThread3Test.html
index b7fb3a44355f07..3cdfae015063e8 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbthreadsmessage/ViewMBThread3MessageTest.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbthreads/ViewMBThread3Test.html
@@ -1,12 +1,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>ViewMBThread3MessageTest</title>
+<title>ViewMBThread3Test</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3">ViewMBThread3MessageTest</td></tr>
+<tr><td rowspan="1" colspan="3">ViewMBThread3Test</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbthreadsmessage/ViewMBThread3MessageTest.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbthreads/ViewMBThread3Test.java
similarity index 92%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbthreadsmessage/ViewMBThread3MessageTest.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbthreads/ViewMBThread3Test.java
index 1521b4dd426ddb..6094865fa06f4f 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbthreadsmessage/ViewMBThread3MessageTest.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/postnewmbthreads/ViewMBThread3Test.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbthreadsmessage;
+package com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbthreads;
 
 import com.liferay.portalweb.portal.BaseTestCase;
 import com.liferay.portalweb.portal.util.RuntimeVariables;
@@ -20,8 +20,8 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class ViewMBThread3MessageTest extends BaseTestCase {
-	public void testViewMBThread3Message() throws Exception {
+public class ViewMBThread3Test extends BaseTestCase {
+	public void testViewMBThread3() throws Exception {
 		selenium.open("/web/guest/home/");
 		loadRequiredJavaScriptModules();
 		selenium.clickAt("link=Message Boards Test Page",
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/previewmbthreadmessagedetails/PreviewMBThreadMessageDetailsTest.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/previewmbthreaddetails/PreviewMBThreadDetailsTest.html
similarity index 96%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/previewmbthreadmessagedetails/PreviewMBThreadMessageDetailsTest.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/previewmbthreaddetails/PreviewMBThreadDetailsTest.html
index 05c561ed81dc16..248306c9a13efe 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/previewmbthreadmessagedetails/PreviewMBThreadMessageDetailsTest.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/previewmbthreaddetails/PreviewMBThreadDetailsTest.html
@@ -1,12 +1,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>PreviewMBThreadMessageDetailsTest</title>
+<title>PreviewMBThreadDetailsTest</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3">PreviewMBThreadMessageDetailsTest</td></tr>
+<tr><td rowspan="1" colspan="3">PreviewMBThreadDetailsTest</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/previewmbthreadmessagedetails/PreviewMBThreadMessageDetailsTest.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/previewmbthreaddetails/PreviewMBThreadDetailsTest.java
similarity index 96%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/previewmbthreadmessagedetails/PreviewMBThreadMessageDetailsTest.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/previewmbthreaddetails/PreviewMBThreadDetailsTest.java
index 2449a4c5144fd8..786afb050407a8 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/previewmbthreadmessagedetails/PreviewMBThreadMessageDetailsTest.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/previewmbthreaddetails/PreviewMBThreadDetailsTest.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.previewmbthreadmessagedetails;
+package com.liferay.portalweb.portlet.messageboards.mbthread.previewmbthreaddetails;
 
 import com.liferay.portalweb.portal.BaseTestCase;
 import com.liferay.portalweb.portal.util.RuntimeVariables;
@@ -20,8 +20,8 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class PreviewMBThreadMessageDetailsTest extends BaseTestCase {
-	public void testPreviewMBThreadMessageDetails() throws Exception {
+public class PreviewMBThreadDetailsTest extends BaseTestCase {
+	public void testPreviewMBThreadDetails() throws Exception {
 		selenium.open("/web/guest/home/");
 		loadRequiredJavaScriptModules();
 
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbmessage/AddMBMessageTests.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/previewmbthreaddetails/PreviewMBThreadDetailsTests.html
similarity index 79%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbmessage/AddMBMessageTests.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/previewmbthreaddetails/PreviewMBThreadDetailsTests.html
index b1a0e6dc2dfa23..ad4bdc8851b57f 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbmessage/AddMBMessageTests.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/previewmbthreaddetails/PreviewMBThreadDetailsTests.html
@@ -10,8 +10,8 @@
 <tr><td><b>Test Suite</b></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPageMBTest.html">AddPageMBTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPortletMBTest.html">AddPortletMBTest</a></td></tr>
-<tr><td><a href="AddMBMessageTest.html">AddMBMessageTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/postnewmbthreadmessage/TearDownMBThreadTest.html">TearDownMBThreadTest</a></td></tr>
+<tr><td><a href="PreviewMBThreadDetailsTest.html">PreviewMBThreadDetailsTest</a></td></tr>
+<tr><td><a href="TearDownMBThreadTest.html">TearDownMBThreadTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portal/util/TearDownPageTest.html">TearDownPageTest</a></td></tr>
 </tbody></table>
 </body>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbthreadmessage/PostNewMBThreadMessageTests.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/previewmbthreaddetails/PreviewMBThreadDetailsTests.java
similarity index 82%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbthreadmessage/PostNewMBThreadMessageTests.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/previewmbthreaddetails/PreviewMBThreadDetailsTests.java
index c345fb851784c5..f24e390e2e06ca 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbthreadmessage/PostNewMBThreadMessageTests.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/previewmbthreaddetails/PreviewMBThreadDetailsTests.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbthreadmessage;
+package com.liferay.portalweb.portlet.messageboards.mbthread.previewmbthreaddetails;
 
 import com.liferay.portalweb.portal.BaseTestSuite;
 import com.liferay.portalweb.portal.util.TearDownPageTest;
@@ -25,13 +25,12 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class PostNewMBThreadMessageTests extends BaseTestSuite {
+public class PreviewMBThreadDetailsTests extends BaseTestSuite {
 	public static Test suite() {
 		TestSuite testSuite = new TestSuite();
 		testSuite.addTestSuite(AddPageMBTest.class);
 		testSuite.addTestSuite(AddPortletMBTest.class);
-		testSuite.addTestSuite(PostNewMBThreadMessageTest.class);
-		testSuite.addTestSuite(ViewMBThreadMessageTest.class);
+		testSuite.addTestSuite(PreviewMBThreadDetailsTest.class);
 		testSuite.addTestSuite(TearDownMBThreadTest.class);
 		testSuite.addTestSuite(TearDownPageTest.class);
 
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/previewmbthreadmessagedetails/TearDownMBThreadMessageTest.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/previewmbthreaddetails/TearDownMBThreadTest.html
similarity index 96%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/previewmbthreadmessagedetails/TearDownMBThreadMessageTest.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/previewmbthreaddetails/TearDownMBThreadTest.html
index 436be6b81206d4..8cff67a1ff5517 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/previewmbthreadmessagedetails/TearDownMBThreadMessageTest.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/previewmbthreaddetails/TearDownMBThreadTest.html
@@ -1,13 +1,14 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>TearDownMBThreadMessageTest</title>
+<title>TearDownMBThreadTest</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3">TearDownMBThreadMessageTest</td></tr>
+<tr><td rowspan="1" colspan="3">TearDownMBThreadTest</td></tr>
 </thead><tbody>
+<!--This test deletes drafts as well as posts-->
 <tr>
 	<td>open</td>
 	<td>/web/guest/home/</td>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/previewmbthreadmessagedetails/TearDownMBThreadMessageTest.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/previewmbthreaddetails/TearDownMBThreadTest.java
similarity index 96%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/previewmbthreadmessagedetails/TearDownMBThreadMessageTest.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/previewmbthreaddetails/TearDownMBThreadTest.java
index a8bf804b3992b4..400026408a1910 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/previewmbthreadmessagedetails/TearDownMBThreadMessageTest.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/previewmbthreaddetails/TearDownMBThreadTest.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.previewmbthreadmessagedetails;
+package com.liferay.portalweb.portlet.messageboards.mbthread.previewmbthreaddetails;
 
 import com.liferay.portalweb.portal.BaseTestCase;
 import com.liferay.portalweb.portal.util.RuntimeVariables;
@@ -20,8 +20,8 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class TearDownMBThreadMessageTest extends BaseTestCase {
-	public void testTearDownMBThreadMessage() throws Exception {
+public class TearDownMBThreadTest extends BaseTestCase {
+	public void testTearDownMBThread() throws Exception {
 		int label = 1;
 
 		while (label >= 1) {
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/previousmbcategorymessage/PreviousMBCategoryMessageTest.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/previousmbcategorythread/PreviousMBCategoryThreadTest.html
similarity index 92%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/previousmbcategorymessage/PreviousMBCategoryMessageTest.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/previousmbcategorythread/PreviousMBCategoryThreadTest.html
index 210b102b1f825d..9adf71623ab376 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/previousmbcategorymessage/PreviousMBCategoryMessageTest.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/previousmbcategorythread/PreviousMBCategoryThreadTest.html
@@ -1,12 +1,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>PreviousMBCategoryMessageTest</title>
+<title>PreviousMBCategoryThreadTest</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3">PreviousMBCategoryMessageTest</td></tr>
+<tr><td rowspan="1" colspan="3">PreviousMBCategoryThreadTest</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/previousmbcategorymessage/PreviousMBCategoryMessageTest.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/previousmbcategorythread/PreviousMBCategoryThreadTest.java
similarity index 92%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/previousmbcategorymessage/PreviousMBCategoryMessageTest.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/previousmbcategorythread/PreviousMBCategoryThreadTest.java
index 5586cf23fb8827..6738831630f17a 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/previousmbcategorymessage/PreviousMBCategoryMessageTest.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/previousmbcategorythread/PreviousMBCategoryThreadTest.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.previousmbcategorymessage;
+package com.liferay.portalweb.portlet.messageboards.mbthread.previousmbcategorythread;
 
 import com.liferay.portalweb.portal.BaseTestCase;
 import com.liferay.portalweb.portal.util.RuntimeVariables;
@@ -20,8 +20,8 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class PreviousMBCategoryMessageTest extends BaseTestCase {
-	public void testPreviousMBCategoryMessage() throws Exception {
+public class PreviousMBCategoryThreadTest extends BaseTestCase {
+	public void testPreviousMBCategoryThread() throws Exception {
 		selenium.open("/web/guest/home/");
 		loadRequiredJavaScriptModules();
 
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/nextmbcategorymessage/NextMBCategoryMessageTests.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/previousmbcategorythread/PreviousMBCategoryThreadTests.html
similarity index 69%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/nextmbcategorymessage/NextMBCategoryMessageTests.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/previousmbcategorythread/PreviousMBCategoryThreadTests.html
index 1fd4aeadf4d840..ad2162680b72dc 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/nextmbcategorymessage/NextMBCategoryMessageTests.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/previousmbcategorythread/PreviousMBCategoryThreadTests.html
@@ -3,18 +3,18 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
   <meta content="text/html; charset=UTF-8" http-equiv="content-type" />
-  <title>NextMBCategoryMessageTests</title>
+  <title>PreviousMBCategoryThreadTests</title>
 </head>
 <body>
 <table id="suiteTable" cellpadding="1" cellspacing="1" border="1" class="selenium"><tbody>
-<tr><td><b>NextMBCategoryMessageTests</b></td></tr>
+<tr><td><b>PreviousMBCategoryThreadTests</b></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPageMBTest.html">AddPageMBTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPortletMBTest.html">AddPortletMBTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/AddMBCategoryTest.html">AddMBCategoryTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThread1MessageTest.html">PostNewMBCategoryThread1MessageTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThread2MessageTest.html">PostNewMBCategoryThread2MessageTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThread3MessageTest.html">PostNewMBCategoryThread3MessageTest</a></td></tr>
-<tr><td><a href="NextMBCategoryMessageTest.html">NextMBCategoryMessageTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategoryThread1Test.html">PostNewMBCategoryThread1Test</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategoryThread2Test.html">PostNewMBCategoryThread2Test</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategoryThread3Test.html">PostNewMBCategoryThread3Test</a></td></tr>
+<tr><td><a href="PreviousMBCategoryThreadTest.html">PreviousMBCategoryThreadTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/TearDownMBCategoryTest.html">TearDownMBCategoryTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portal/util/TearDownPageTest.html">TearDownPageTest</a></td></tr>
 </tbody></table>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/previousmbcategorythread/PreviousMBCategoryThreadTests.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/previousmbcategorythread/PreviousMBCategoryThreadTests.java
new file mode 100644
index 00000000000000..afe3dbec7f9e36
--- /dev/null
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/previousmbcategorythread/PreviousMBCategoryThreadTests.java
@@ -0,0 +1,48 @@
+/**
+ * Copyright (c) 2000-2012 Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package com.liferay.portalweb.portlet.messageboards.mbthread.previousmbcategorythread;
+
+import com.liferay.portalweb.portal.BaseTestSuite;
+import com.liferay.portalweb.portal.util.TearDownPageTest;
+import com.liferay.portalweb.portlet.messageboards.mbcategory.addmbcategory.AddMBCategoryTest;
+import com.liferay.portalweb.portlet.messageboards.mbcategory.addmbcategory.TearDownMBCategoryTest;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbcategorythread.PostNewMBCategoryThread1Test;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbcategorythread.PostNewMBCategoryThread2Test;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbcategorythread.PostNewMBCategoryThread3Test;
+import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPageMBTest;
+import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPortletMBTest;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+/**
+ * @author Brian Wing Shun Chan
+ */
+public class PreviousMBCategoryThreadTests extends BaseTestSuite {
+	public static Test suite() {
+		TestSuite testSuite = new TestSuite();
+		testSuite.addTestSuite(AddPageMBTest.class);
+		testSuite.addTestSuite(AddPortletMBTest.class);
+		testSuite.addTestSuite(AddMBCategoryTest.class);
+		testSuite.addTestSuite(PostNewMBCategoryThread1Test.class);
+		testSuite.addTestSuite(PostNewMBCategoryThread2Test.class);
+		testSuite.addTestSuite(PostNewMBCategoryThread3Test.class);
+		testSuite.addTestSuite(PreviousMBCategoryThreadTest.class);
+		testSuite.addTestSuite(TearDownMBCategoryTest.class);
+		testSuite.addTestSuite(TearDownPageTest.class);
+
+		return testSuite;
+	}
+}
\ No newline at end of file
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/ratembcategorymessage/RateMBCategoryMessageTest.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/ratembcategorythread/RateMBCategoryThreadTest.html
similarity index 97%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/ratembcategorymessage/RateMBCategoryMessageTest.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/ratembcategorythread/RateMBCategoryThreadTest.html
index d1b9f83769b5a0..4d25aa6db96245 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/ratembcategorymessage/RateMBCategoryMessageTest.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/ratembcategorythread/RateMBCategoryThreadTest.html
@@ -1,12 +1,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>RateMBCategoryMessageTest</title>
+<title>RateMBCategoryThreadTest</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3">RateMBCategoryMessageTest</td></tr>
+<tr><td rowspan="1" colspan="3">RateMBCategoryThreadTest</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/ratembcategorymessage/RateMBCategoryMessageTest.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/ratembcategorythread/RateMBCategoryThreadTest.java
similarity index 96%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/ratembcategorymessage/RateMBCategoryMessageTest.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/ratembcategorythread/RateMBCategoryThreadTest.java
index 7aaf0a1cd62bf2..357a7247b8d57e 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/ratembcategorymessage/RateMBCategoryMessageTest.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/ratembcategorythread/RateMBCategoryThreadTest.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.ratembcategorymessage;
+package com.liferay.portalweb.portlet.messageboards.mbthread.ratembcategorythread;
 
 import com.liferay.portalweb.portal.BaseTestCase;
 import com.liferay.portalweb.portal.util.RuntimeVariables;
@@ -20,8 +20,8 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class RateMBCategoryMessageTest extends BaseTestCase {
-	public void testRateMBCategoryMessage() throws Exception {
+public class RateMBCategoryThreadTest extends BaseTestCase {
+	public void testRateMBCategoryThread() throws Exception {
 		selenium.open("/web/guest/home/");
 		loadRequiredJavaScriptModules();
 
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessage/AddMBCategoryMessageTests.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/ratembcategorythread/RateMBCategoryThreadTests.html
similarity index 78%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessage/AddMBCategoryMessageTests.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/ratembcategorythread/RateMBCategoryThreadTests.html
index acb6edb4583f21..129efb6c5433df 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/addmbcategorymessage/AddMBCategoryMessageTests.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/ratembcategorythread/RateMBCategoryThreadTests.html
@@ -3,16 +3,16 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
   <meta content="text/html; charset=UTF-8" http-equiv="content-type" />
-  <title>AddMBCategoryMessageTests</title>
+  <title>RateMBCategoryThreadTests</title>
 </head>
 <body>
 <table id="suiteTable" cellpadding="1" cellspacing="1" border="1" class="selenium"><tbody>
-<tr><td><b>AddMBCategoryMessageTests</b></td></tr>
+<tr><td><b>RateMBCategoryThreadTests</b></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPageMBTest.html">AddPageMBTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPortletMBTest.html">AddPortletMBTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/AddMBCategoryTest.html">AddMBCategoryTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThreadMessageTest.html">PostNewMBCategoryThreadMessageTest</a></td></tr>
-<tr><td><a href="ViewMBCategoryMessageTest.html">ViewMBCategoryMessageTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategoryThreadTest.html">PostNewMBCategoryThreadTest</a></td></tr>
+<tr><td><a href="RateMBCategoryThreadTest.html">RateMBCategoryThreadTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/TearDownMBCategoryTest.html">TearDownMBCategoryTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portal/util/TearDownPageTest.html">TearDownPageTest</a></td></tr>
 </tbody></table>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/ratembcategorythread/RateMBCategoryThreadTests.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/ratembcategorythread/RateMBCategoryThreadTests.java
new file mode 100644
index 00000000000000..0d47cfed2f01bf
--- /dev/null
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/ratembcategorythread/RateMBCategoryThreadTests.java
@@ -0,0 +1,44 @@
+/**
+ * Copyright (c) 2000-2012 Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package com.liferay.portalweb.portlet.messageboards.mbthread.ratembcategorythread;
+
+import com.liferay.portalweb.portal.BaseTestSuite;
+import com.liferay.portalweb.portal.util.TearDownPageTest;
+import com.liferay.portalweb.portlet.messageboards.mbcategory.addmbcategory.AddMBCategoryTest;
+import com.liferay.portalweb.portlet.messageboards.mbcategory.addmbcategory.TearDownMBCategoryTest;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbcategorythread.PostNewMBCategoryThreadTest;
+import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPageMBTest;
+import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPortletMBTest;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+/**
+ * @author Brian Wing Shun Chan
+ */
+public class RateMBCategoryThreadTests extends BaseTestSuite {
+	public static Test suite() {
+		TestSuite testSuite = new TestSuite();
+		testSuite.addTestSuite(AddPageMBTest.class);
+		testSuite.addTestSuite(AddPortletMBTest.class);
+		testSuite.addTestSuite(AddMBCategoryTest.class);
+		testSuite.addTestSuite(PostNewMBCategoryThreadTest.class);
+		testSuite.addTestSuite(RateMBCategoryThreadTest.class);
+		testSuite.addTestSuite(TearDownMBCategoryTest.class);
+		testSuite.addTestSuite(TearDownPageTest.class);
+
+		return testSuite;
+	}
+}
\ No newline at end of file
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/markasanswermbcategorymessagequestionreply/AddMBCategoryMessageQuestionReplyTest.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbcategorythreadquestionreply/ReplyMBCategoryThreadQuestionReplyTest.html
similarity index 96%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/markasanswermbcategorymessagequestionreply/AddMBCategoryMessageQuestionReplyTest.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbcategorythreadquestionreply/ReplyMBCategoryThreadQuestionReplyTest.html
index 4fabd30657b9d7..c86217cf715252 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/markasanswermbcategorymessagequestionreply/AddMBCategoryMessageQuestionReplyTest.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbcategorythreadquestionreply/ReplyMBCategoryThreadQuestionReplyTest.html
@@ -1,12 +1,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>AddMBCategoryMessageQuestionReplyTest</title>
+<title>ReplyMBCategoryThreadQuestionReplyTest</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3">AddMBCategoryMessageQuestionReplyTest</td></tr>
+<tr><td rowspan="1" colspan="3">ReplyMBCategoryThreadQuestionReplyTest</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/unmarkmbcategorymessagequestionreply/AddMBCategoryMessageQuestionReplyTest.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbcategorythreadquestionreply/ReplyMBCategoryThreadQuestionReplyTest.java
similarity index 96%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/unmarkmbcategorymessagequestionreply/AddMBCategoryMessageQuestionReplyTest.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbcategorythreadquestionreply/ReplyMBCategoryThreadQuestionReplyTest.java
index 2a9bd527e28136..a885812a6ea4ad 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/unmarkmbcategorymessagequestionreply/AddMBCategoryMessageQuestionReplyTest.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbcategorythreadquestionreply/ReplyMBCategoryThreadQuestionReplyTest.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.unmarkmbcategorymessagequestionreply;
+package com.liferay.portalweb.portlet.messageboards.mbthread.replymbcategorythreadquestionreply;
 
 import com.liferay.portalweb.portal.BaseTestCase;
 import com.liferay.portalweb.portal.util.RuntimeVariables;
@@ -20,8 +20,8 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class AddMBCategoryMessageQuestionReplyTest extends BaseTestCase {
-	public void testAddMBCategoryMessageQuestionReply()
+public class ReplyMBCategoryThreadQuestionReplyTest extends BaseTestCase {
+	public void testReplyMBCategoryThreadQuestionReply()
 		throws Exception {
 		selenium.open("/web/guest/home/");
 		loadRequiredJavaScriptModules();
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/ratembcategorymessage/RateMBCategoryMessageTests.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbcategorythreadquestionreply/ReplyMBCategoryThreadQuestionReplyTests.html
similarity index 78%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/ratembcategorymessage/RateMBCategoryMessageTests.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbcategorythreadquestionreply/ReplyMBCategoryThreadQuestionReplyTests.html
index a5d2a9361df964..8ee19defddf00b 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/ratembcategorymessage/RateMBCategoryMessageTests.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbcategorythreadquestionreply/ReplyMBCategoryThreadQuestionReplyTests.html
@@ -3,16 +3,16 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
   <meta content="text/html; charset=UTF-8" http-equiv="content-type" />
-  <title>RateMBCategoryMessageTests</title>
+  <title>Test Suite</title>
 </head>
 <body>
 <table id="suiteTable" cellpadding="1" cellspacing="1" border="1" class="selenium"><tbody>
-<tr><td><b>RateMBCategoryMessageTests</b></td></tr>
+<tr><td><b>Test Suite</b></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPageMBTest.html">AddPageMBTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPortletMBTest.html">AddPortletMBTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/AddMBCategoryTest.html">AddMBCategoryTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThreadMessageTest.html">PostNewMBCategoryThreadMessageTest</a></td></tr>
-<tr><td><a href="RateMBCategoryMessageTest.html">RateMBCategoryMessageTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/postnewmbcategorythreadquestion/PostNewMBCategoryThreadQuestionTest.html">PostNewMBCategoryThreadQuestionTest</a></td></tr>
+<tr><td><a href="ReplyMBCategoryThreadQuestionReplyTest.html">ReplyMBCategoryThreadQuestionReplyTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/TearDownMBCategoryTest.html">TearDownMBCategoryTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portal/util/TearDownPageTest.html">TearDownPageTest</a></td></tr>
 </tbody></table>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbcategorythreadquestionreply/ReplyMBCategoryThreadQuestionReplyTests.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbcategorythreadquestionreply/ReplyMBCategoryThreadQuestionReplyTests.java
new file mode 100644
index 00000000000000..8931d820441740
--- /dev/null
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbcategorythreadquestionreply/ReplyMBCategoryThreadQuestionReplyTests.java
@@ -0,0 +1,44 @@
+/**
+ * Copyright (c) 2000-2012 Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package com.liferay.portalweb.portlet.messageboards.mbthread.replymbcategorythreadquestionreply;
+
+import com.liferay.portalweb.portal.BaseTestSuite;
+import com.liferay.portalweb.portal.util.TearDownPageTest;
+import com.liferay.portalweb.portlet.messageboards.mbcategory.addmbcategory.AddMBCategoryTest;
+import com.liferay.portalweb.portlet.messageboards.mbcategory.addmbcategory.TearDownMBCategoryTest;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbcategorythreadquestion.PostNewMBCategoryThreadQuestionTest;
+import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPageMBTest;
+import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPortletMBTest;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+/**
+ * @author Brian Wing Shun Chan
+ */
+public class ReplyMBCategoryThreadQuestionReplyTests extends BaseTestSuite {
+	public static Test suite() {
+		TestSuite testSuite = new TestSuite();
+		testSuite.addTestSuite(AddPageMBTest.class);
+		testSuite.addTestSuite(AddPortletMBTest.class);
+		testSuite.addTestSuite(AddMBCategoryTest.class);
+		testSuite.addTestSuite(PostNewMBCategoryThreadQuestionTest.class);
+		testSuite.addTestSuite(ReplyMBCategoryThreadQuestionReplyTest.class);
+		testSuite.addTestSuite(TearDownMBCategoryTest.class);
+		testSuite.addTestSuite(TearDownPageTest.class);
+
+		return testSuite;
+	}
+}
\ No newline at end of file
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbcategorythreadmessagereplies/ReplyMBCategoryThreadMessageRepliesTests.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbcategorythreadreplies/ReplyMBCategoryThreadRepliesTests.html
similarity index 57%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbcategorythreadmessagereplies/ReplyMBCategoryThreadMessageRepliesTests.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbcategorythreadreplies/ReplyMBCategoryThreadRepliesTests.html
index 92cc3af82e3761..b85c9ababc4db9 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbcategorythreadmessagereplies/ReplyMBCategoryThreadMessageRepliesTests.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbcategorythreadreplies/ReplyMBCategoryThreadRepliesTests.html
@@ -3,23 +3,23 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
   <meta content="text/html; charset=UTF-8" http-equiv="content-type" />
-  <title>Test Suite</title>
+  <title>ReplyMBCategoryThreadRepliesTests</title>
 </head>
 <body>
 <table id="suiteTable" cellpadding="1" cellspacing="1" border="1" class="selenium"><tbody>
-<tr><td><b>Test Suite</b></td></tr>
+<tr><td><b>ReplyMBCategoryThreadRepliesTests</b></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPageMBTest.html">AddPageMBTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPortletMBTest.html">AddPortletMBTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/AddMBCategoryTest.html">AddMBCategoryTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThreadMessageTest.html">PostNewMBCategoryThreadMessageTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/replymbcategorythreadmessagereply/ReplyMBCategoryThreadMessageReply1Test.html">ReplyMBCategoryThreadMessageReply1Test</a></td></tr>
-<tr><td><a href="ViewMBCategoryThreadMessageReply1Test.html">ViewMBCategoryThreadMessageReply1Test</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/replymbcategorythreadmessagereply/ReplyMBCategoryThreadMessageReply2Test.html">ReplyMBCategoryThreadMessageReply2Test</a></td></tr>
-<tr><td><a href="ViewMBCategoryThreadMessageReply2Test.html">ViewMBCategoryThreadMessageReply2Test</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/replymbcategorythreadmessagereply/ReplyMBCategoryThreadMessageReply3Test.html">ReplyMBCategoryThreadMessageReply3Test</a></td></tr>
-<tr><td><a href="ViewMBCategoryThreadMessageReply3Test.html">ViewMBCategoryThreadMessageReply3Test</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategoryThreadTest.html">PostNewMBCategoryThreadTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/replymbcategorythreadreply/ReplyMBCategoryThreadReply1Test.html">ReplyMBCategoryThreadReply1Test</a></td></tr>
+<tr><td><a href="ViewMBCategoryThreadReply1Test.html">ViewMBCategoryThreadReply1Test</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/replymbcategorythreadreply/ReplyMBCategoryThreadReply2Test.html">ReplyMBCategoryThreadReply2Test</a></td></tr>
+<tr><td><a href="ViewMBCategoryThreadReply2Test.html">ViewMBCategoryThreadReply2Test</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/replymbcategorythreadreply/ReplyMBCategoryThreadReply3Test.html">ReplyMBCategoryThreadReply3Test</a></td></tr>
+<tr><td><a href="ViewMBCategoryThreadReply3Test.html">ViewMBCategoryThreadReply3Test</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/TearDownMBCategoryTest.html">TearDownMBCategoryTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/postnewmbthreadmessage/TearDownMBThreadTest.html">TearDownMBThreadTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/postnewmbthread/TearDownMBThreadTest.html">TearDownMBThreadTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portal/util/TearDownPageTest.html">TearDownPageTest</a></td></tr>
 </tbody></table>
 </body>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadsmessage/PostNewMBCategoryThreadsMessageTests.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbcategorythreadreplies/ReplyMBCategoryThreadRepliesTests.java
similarity index 57%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadsmessage/PostNewMBCategoryThreadsMessageTests.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbcategorythreadreplies/ReplyMBCategoryThreadRepliesTests.java
index e7255ac9ce4024..5d6124dd3a5380 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadsmessage/PostNewMBCategoryThreadsMessageTests.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbcategorythreadreplies/ReplyMBCategoryThreadRepliesTests.java
@@ -12,16 +12,17 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbcategorythreadsmessage;
+package com.liferay.portalweb.portlet.messageboards.mbthread.replymbcategorythreadreplies;
 
 import com.liferay.portalweb.portal.BaseTestSuite;
 import com.liferay.portalweb.portal.util.TearDownPageTest;
 import com.liferay.portalweb.portlet.messageboards.mbcategory.addmbcategory.AddMBCategoryTest;
 import com.liferay.portalweb.portlet.messageboards.mbcategory.addmbcategory.TearDownMBCategoryTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbcategorythreadmessage.PostNewMBCategoryThread1MessageTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbcategorythreadmessage.PostNewMBCategoryThread2MessageTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbcategorythreadmessage.PostNewMBCategoryThread3MessageTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbthreadmessage.TearDownMBThreadTest;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbcategorythread.PostNewMBCategoryThreadTest;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbthread.TearDownMBThreadTest;
+import com.liferay.portalweb.portlet.messageboards.mbthread.replymbcategorythreadreply.ReplyMBCategoryThreadReply1Test;
+import com.liferay.portalweb.portlet.messageboards.mbthread.replymbcategorythreadreply.ReplyMBCategoryThreadReply2Test;
+import com.liferay.portalweb.portlet.messageboards.mbthread.replymbcategorythreadreply.ReplyMBCategoryThreadReply3Test;
 import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPageMBTest;
 import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPortletMBTest;
 
@@ -31,18 +32,19 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class PostNewMBCategoryThreadsMessageTests extends BaseTestSuite {
+public class ReplyMBCategoryThreadRepliesTests extends BaseTestSuite {
 	public static Test suite() {
 		TestSuite testSuite = new TestSuite();
 		testSuite.addTestSuite(AddPageMBTest.class);
 		testSuite.addTestSuite(AddPortletMBTest.class);
 		testSuite.addTestSuite(AddMBCategoryTest.class);
-		testSuite.addTestSuite(PostNewMBCategoryThread1MessageTest.class);
-		testSuite.addTestSuite(ViewMBCategoryThread1MessageTest.class);
-		testSuite.addTestSuite(PostNewMBCategoryThread2MessageTest.class);
-		testSuite.addTestSuite(ViewMBCategoryThread2MessageTest.class);
-		testSuite.addTestSuite(PostNewMBCategoryThread3MessageTest.class);
-		testSuite.addTestSuite(ViewMBCategoryThread3MessageTest.class);
+		testSuite.addTestSuite(PostNewMBCategoryThreadTest.class);
+		testSuite.addTestSuite(ReplyMBCategoryThreadReply1Test.class);
+		testSuite.addTestSuite(ViewMBCategoryThreadReply1Test.class);
+		testSuite.addTestSuite(ReplyMBCategoryThreadReply2Test.class);
+		testSuite.addTestSuite(ViewMBCategoryThreadReply2Test.class);
+		testSuite.addTestSuite(ReplyMBCategoryThreadReply3Test.class);
+		testSuite.addTestSuite(ViewMBCategoryThreadReply3Test.class);
 		testSuite.addTestSuite(TearDownMBCategoryTest.class);
 		testSuite.addTestSuite(TearDownMBThreadTest.class);
 		testSuite.addTestSuite(TearDownPageTest.class);
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbcategorythreadmessagereplies/ViewMBCategoryThreadMessageReply1Test.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbcategorythreadreplies/ViewMBCategoryThreadReply1Test.html
similarity index 96%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbcategorythreadmessagereplies/ViewMBCategoryThreadMessageReply1Test.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbcategorythreadreplies/ViewMBCategoryThreadReply1Test.html
index f12f25ebb12396..754f115fdd7a34 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbcategorythreadmessagereplies/ViewMBCategoryThreadMessageReply1Test.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbcategorythreadreplies/ViewMBCategoryThreadReply1Test.html
@@ -1,12 +1,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>ViewMBCategoryThreadMessageReply1Test</title>
+<title>ViewMBCategoryThreadReply1Test</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3">ViewMBCategoryThreadMessageReply1Test</td></tr>
+<tr><td rowspan="1" colspan="3">ViewMBCategoryThreadReply1Test</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbcategorythreadmessagereplies/ViewMBCategoryThreadMessageReply1Test.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbcategorythreadreplies/ViewMBCategoryThreadReply1Test.java
similarity index 94%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbcategorythreadmessagereplies/ViewMBCategoryThreadMessageReply1Test.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbcategorythreadreplies/ViewMBCategoryThreadReply1Test.java
index 0a6a7646c4a44e..8ef14bf4560621 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbcategorythreadmessagereplies/ViewMBCategoryThreadMessageReply1Test.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbcategorythreadreplies/ViewMBCategoryThreadReply1Test.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.replymbcategorythreadmessagereplies;
+package com.liferay.portalweb.portlet.messageboards.mbthread.replymbcategorythreadreplies;
 
 import com.liferay.portalweb.portal.BaseTestCase;
 import com.liferay.portalweb.portal.util.RuntimeVariables;
@@ -20,9 +20,8 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class ViewMBCategoryThreadMessageReply1Test extends BaseTestCase {
-	public void testViewMBCategoryThreadMessageReply1()
-		throws Exception {
+public class ViewMBCategoryThreadReply1Test extends BaseTestCase {
+	public void testViewMBCategoryThreadReply1() throws Exception {
 		selenium.open("/web/guest/home/");
 		loadRequiredJavaScriptModules();
 		selenium.clickAt("link=Message Boards Test Page",
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbcategorythreadmessagereplies/ViewMBCategoryThreadMessageReply2Test.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbcategorythreadreplies/ViewMBCategoryThreadReply2Test.html
similarity index 96%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbcategorythreadmessagereplies/ViewMBCategoryThreadMessageReply2Test.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbcategorythreadreplies/ViewMBCategoryThreadReply2Test.html
index c46dcd7bfc87fe..0f834ccf594237 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbcategorythreadmessagereplies/ViewMBCategoryThreadMessageReply2Test.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbcategorythreadreplies/ViewMBCategoryThreadReply2Test.html
@@ -1,12 +1,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>ViewMBCategoryThreadMessageReply2Test</title>
+<title>ViewMBCategoryThreadReply2Test</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3">ViewMBCategoryThreadMessageReply2Test</td></tr>
+<tr><td rowspan="1" colspan="3">ViewMBCategoryThreadReply2Test</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbcategorythreadmessagereplies/ViewMBCategoryThreadMessageReply2Test.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbcategorythreadreplies/ViewMBCategoryThreadReply2Test.java
similarity index 95%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbcategorythreadmessagereplies/ViewMBCategoryThreadMessageReply2Test.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbcategorythreadreplies/ViewMBCategoryThreadReply2Test.java
index 3a10863a0942ea..61ea356175c6cb 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbcategorythreadmessagereplies/ViewMBCategoryThreadMessageReply2Test.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbcategorythreadreplies/ViewMBCategoryThreadReply2Test.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.replymbcategorythreadmessagereplies;
+package com.liferay.portalweb.portlet.messageboards.mbthread.replymbcategorythreadreplies;
 
 import com.liferay.portalweb.portal.BaseTestCase;
 import com.liferay.portalweb.portal.util.RuntimeVariables;
@@ -20,9 +20,8 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class ViewMBCategoryThreadMessageReply2Test extends BaseTestCase {
-	public void testViewMBCategoryThreadMessageReply2()
-		throws Exception {
+public class ViewMBCategoryThreadReply2Test extends BaseTestCase {
+	public void testViewMBCategoryThreadReply2() throws Exception {
 		selenium.open("/web/guest/home/");
 		loadRequiredJavaScriptModules();
 		selenium.clickAt("link=Message Boards Test Page",
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbcategorythreadmessagereplies/ViewMBCategoryThreadMessageReply3Test.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbcategorythreadreplies/ViewMBCategoryThreadReply3Test.html
similarity index 97%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbcategorythreadmessagereplies/ViewMBCategoryThreadMessageReply3Test.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbcategorythreadreplies/ViewMBCategoryThreadReply3Test.html
index 68d64a2e337e8d..86fa50fa5c5d9e 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbcategorythreadmessagereplies/ViewMBCategoryThreadMessageReply3Test.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbcategorythreadreplies/ViewMBCategoryThreadReply3Test.html
@@ -1,12 +1,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>ViewMBCategoryThreadMessageReply3Test</title>
+<title>ViewMBCategoryThreadReply3Test</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3">ViewMBCategoryThreadMessageReply3Test</td></tr>
+<tr><td rowspan="1" colspan="3">ViewMBCategoryThreadReply3Test</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbcategorythreadmessagereplies/ViewMBCategoryThreadMessageReply3Test.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbcategorythreadreplies/ViewMBCategoryThreadReply3Test.java
similarity index 96%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbcategorythreadmessagereplies/ViewMBCategoryThreadMessageReply3Test.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbcategorythreadreplies/ViewMBCategoryThreadReply3Test.java
index 54b20714a46d49..04987557cd428e 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbcategorythreadmessagereplies/ViewMBCategoryThreadMessageReply3Test.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbcategorythreadreplies/ViewMBCategoryThreadReply3Test.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.replymbcategorythreadmessagereplies;
+package com.liferay.portalweb.portlet.messageboards.mbthread.replymbcategorythreadreplies;
 
 import com.liferay.portalweb.portal.BaseTestCase;
 import com.liferay.portalweb.portal.util.RuntimeVariables;
@@ -20,9 +20,8 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class ViewMBCategoryThreadMessageReply3Test extends BaseTestCase {
-	public void testViewMBCategoryThreadMessageReply3()
-		throws Exception {
+public class ViewMBCategoryThreadReply3Test extends BaseTestCase {
+	public void testViewMBCategoryThreadReply3() throws Exception {
 		selenium.open("/web/guest/home/");
 		loadRequiredJavaScriptModules();
 		selenium.clickAt("link=Message Boards Test Page",
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbcategorythreadmessagereply/ReplyMBCategoryThreadMessageReply1Test.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbcategorythreadreply/ReplyMBCategoryThreadReply1Test.html
similarity index 94%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbcategorythreadmessagereply/ReplyMBCategoryThreadMessageReply1Test.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbcategorythreadreply/ReplyMBCategoryThreadReply1Test.html
index 11f261633754fe..01a35e2a1653f7 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbcategorythreadmessagereply/ReplyMBCategoryThreadMessageReply1Test.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbcategorythreadreply/ReplyMBCategoryThreadReply1Test.html
@@ -1,12 +1,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>ReplyMBCategoryThreadMessageReply1Test</title>
+<title>ReplyMBCategoryThreadReply1Test</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3">ReplyMBCategoryThreadMessageReply1Test</td></tr>
+<tr><td rowspan="1" colspan="3">ReplyMBCategoryThreadReply1Test</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbcategorythreadmessagereply/ReplyMBCategoryThreadMessageReply1Test.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbcategorythreadreply/ReplyMBCategoryThreadReply1Test.java
similarity index 94%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbcategorythreadmessagereply/ReplyMBCategoryThreadMessageReply1Test.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbcategorythreadreply/ReplyMBCategoryThreadReply1Test.java
index f845093e510ef5..d1c9b66dd296c9 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbcategorythreadmessagereply/ReplyMBCategoryThreadMessageReply1Test.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbcategorythreadreply/ReplyMBCategoryThreadReply1Test.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.replymbcategorythreadmessagereply;
+package com.liferay.portalweb.portlet.messageboards.mbthread.replymbcategorythreadreply;
 
 import com.liferay.portalweb.portal.BaseTestCase;
 import com.liferay.portalweb.portal.util.RuntimeVariables;
@@ -20,9 +20,8 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class ReplyMBCategoryThreadMessageReply1Test extends BaseTestCase {
-	public void testReplyMBCategoryThreadMessageReply1()
-		throws Exception {
+public class ReplyMBCategoryThreadReply1Test extends BaseTestCase {
+	public void testReplyMBCategoryThreadReply1() throws Exception {
 		selenium.open("/web/guest/home/");
 		loadRequiredJavaScriptModules();
 		selenium.clickAt("link=Message Boards Test Page",
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbcategorythreadmessagereply/ReplyMBCategoryThreadMessageReply2Test.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbcategorythreadreply/ReplyMBCategoryThreadReply2Test.html
similarity index 94%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbcategorythreadmessagereply/ReplyMBCategoryThreadMessageReply2Test.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbcategorythreadreply/ReplyMBCategoryThreadReply2Test.html
index 82163b8f23e991..4a28c4a7e93308 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbcategorythreadmessagereply/ReplyMBCategoryThreadMessageReply2Test.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbcategorythreadreply/ReplyMBCategoryThreadReply2Test.html
@@ -1,12 +1,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>ReplyMBCategoryThreadMessageReply2Test</title>
+<title>ReplyMBCategoryThreadReply2Test</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3">ReplyMBCategoryThreadMessageReply2Test</td></tr>
+<tr><td rowspan="1" colspan="3">ReplyMBCategoryThreadReply2Test</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbcategorythreadmessagereply/ReplyMBCategoryThreadMessageReply2Test.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbcategorythreadreply/ReplyMBCategoryThreadReply2Test.java
similarity index 94%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbcategorythreadmessagereply/ReplyMBCategoryThreadMessageReply2Test.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbcategorythreadreply/ReplyMBCategoryThreadReply2Test.java
index 8fb0ffea4e0d00..d860d81cd12753 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbcategorythreadmessagereply/ReplyMBCategoryThreadMessageReply2Test.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbcategorythreadreply/ReplyMBCategoryThreadReply2Test.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.replymbcategorythreadmessagereply;
+package com.liferay.portalweb.portlet.messageboards.mbthread.replymbcategorythreadreply;
 
 import com.liferay.portalweb.portal.BaseTestCase;
 import com.liferay.portalweb.portal.util.RuntimeVariables;
@@ -20,9 +20,8 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class ReplyMBCategoryThreadMessageReply2Test extends BaseTestCase {
-	public void testReplyMBCategoryThreadMessageReply2()
-		throws Exception {
+public class ReplyMBCategoryThreadReply2Test extends BaseTestCase {
+	public void testReplyMBCategoryThreadReply2() throws Exception {
 		selenium.open("/web/guest/home/");
 		loadRequiredJavaScriptModules();
 		selenium.clickAt("link=Message Boards Test Page",
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbcategorythreadmessagereply/ReplyMBCategoryThreadMessageReply3Test.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbcategorythreadreply/ReplyMBCategoryThreadReply3Test.html
similarity index 94%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbcategorythreadmessagereply/ReplyMBCategoryThreadMessageReply3Test.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbcategorythreadreply/ReplyMBCategoryThreadReply3Test.html
index a883c1f5403d39..7313f7d016cb9b 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbcategorythreadmessagereply/ReplyMBCategoryThreadMessageReply3Test.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbcategorythreadreply/ReplyMBCategoryThreadReply3Test.html
@@ -1,12 +1,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>ReplyMBCategoryThreadMessageReply3Test</title>
+<title>ReplyMBCategoryThreadReply3Test</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3">ReplyMBCategoryThreadMessageReply3Test</td></tr>
+<tr><td rowspan="1" colspan="3">ReplyMBCategoryThreadReply3Test</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbcategorythreadmessagereply/ReplyMBCategoryThreadMessageReply3Test.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbcategorythreadreply/ReplyMBCategoryThreadReply3Test.java
similarity index 94%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbcategorythreadmessagereply/ReplyMBCategoryThreadMessageReply3Test.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbcategorythreadreply/ReplyMBCategoryThreadReply3Test.java
index 144f8f006846cd..6f705562dc8672 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbcategorythreadmessagereply/ReplyMBCategoryThreadMessageReply3Test.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbcategorythreadreply/ReplyMBCategoryThreadReply3Test.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.replymbcategorythreadmessagereply;
+package com.liferay.portalweb.portlet.messageboards.mbthread.replymbcategorythreadreply;
 
 import com.liferay.portalweb.portal.BaseTestCase;
 import com.liferay.portalweb.portal.util.RuntimeVariables;
@@ -20,9 +20,8 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class ReplyMBCategoryThreadMessageReply3Test extends BaseTestCase {
-	public void testReplyMBCategoryThreadMessageReply3()
-		throws Exception {
+public class ReplyMBCategoryThreadReply3Test extends BaseTestCase {
+	public void testReplyMBCategoryThreadReply3() throws Exception {
 		selenium.open("/web/guest/home/");
 		loadRequiredJavaScriptModules();
 		selenium.clickAt("link=Message Boards Test Page",
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbcategorythreadmessagereply/ReplyMBCategoryThreadMessageReplyTest.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbcategorythreadreply/ReplyMBCategoryThreadReplyTest.html
similarity index 95%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbcategorythreadmessagereply/ReplyMBCategoryThreadMessageReplyTest.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbcategorythreadreply/ReplyMBCategoryThreadReplyTest.html
index 18a8e6017de321..58a498b68c263e 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbcategorythreadmessagereply/ReplyMBCategoryThreadMessageReplyTest.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbcategorythreadreply/ReplyMBCategoryThreadReplyTest.html
@@ -1,12 +1,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>ReplyMBCategoryThreadMessageReplyTest</title>
+<title>ReplyMBCategoryThreadReplyTest</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3">ReplyMBCategoryThreadMessageReplyTest</td></tr>
+<tr><td rowspan="1" colspan="3">ReplyMBCategoryThreadReplyTest</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbcategorythreadmessagereply/ReplyMBCategoryThreadMessageReplyTest.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbcategorythreadreply/ReplyMBCategoryThreadReplyTest.java
similarity index 94%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbcategorythreadmessagereply/ReplyMBCategoryThreadMessageReplyTest.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbcategorythreadreply/ReplyMBCategoryThreadReplyTest.java
index 7aab22f4b25678..ad78bcab492424 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbcategorythreadmessagereply/ReplyMBCategoryThreadMessageReplyTest.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbcategorythreadreply/ReplyMBCategoryThreadReplyTest.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.replymbcategorythreadmessagereply;
+package com.liferay.portalweb.portlet.messageboards.mbthread.replymbcategorythreadreply;
 
 import com.liferay.portalweb.portal.BaseTestCase;
 import com.liferay.portalweb.portal.util.RuntimeVariables;
@@ -20,9 +20,8 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class ReplyMBCategoryThreadMessageReplyTest extends BaseTestCase {
-	public void testReplyMBCategoryThreadMessageReply()
-		throws Exception {
+public class ReplyMBCategoryThreadReplyTest extends BaseTestCase {
+	public void testReplyMBCategoryThreadReply() throws Exception {
 		selenium.open("/web/guest/home/");
 		loadRequiredJavaScriptModules();
 		selenium.clickAt("link=Message Boards Test Page",
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbcategorythreadreply/ReplyMBCategoryThreadReplyTests.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbcategorythreadreply/ReplyMBCategoryThreadReplyTests.html
new file mode 100644
index 00000000000000..fc77506126950c
--- /dev/null
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbcategorythreadreply/ReplyMBCategoryThreadReplyTests.html
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+  <meta content="text/html; charset=UTF-8" http-equiv="content-type" />
+  <title>Test Suite</title>
+</head>
+<body>
+<table id="suiteTable" cellpadding="1" cellspacing="1" border="1" class="selenium"><tbody>
+<tr><td><b>Test Suite</b></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPageMBTest.html">AddPageMBTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPortletMBTest.html">AddPortletMBTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/AddMBCategoryTest.html">AddMBCategoryTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategoryThreadTest.html">PostNewMBCategoryThreadTest</a></td></tr>
+<tr><td><a href="ReplyMBCategoryThreadReplyTest.html">ReplyMBCategoryThreadReplyTest</a></td></tr>
+<tr><td><a href="ViewMBCategoryThreadReplyTest.html">ViewMBCategoryThreadReplyTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/TearDownMBCategoryTest.html">TearDownMBCategoryTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/postnewmbthread/TearDownMBThreadTest.html">TearDownMBThreadTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portal/util/TearDownPageTest.html">TearDownPageTest</a></td></tr>
+</tbody></table>
+</body>
+</html>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbcategorythreadmessagereply/ReplyMBCategoryThreadMessageReplyTests.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbcategorythreadreply/ReplyMBCategoryThreadReplyTests.java
similarity index 71%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbcategorythreadmessagereply/ReplyMBCategoryThreadMessageReplyTests.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbcategorythreadreply/ReplyMBCategoryThreadReplyTests.java
index 6e8fb732d4e14f..a3532c4b8ce9c8 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbcategorythreadmessagereply/ReplyMBCategoryThreadMessageReplyTests.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbcategorythreadreply/ReplyMBCategoryThreadReplyTests.java
@@ -12,14 +12,14 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.replymbcategorythreadmessagereply;
+package com.liferay.portalweb.portlet.messageboards.mbthread.replymbcategorythreadreply;
 
 import com.liferay.portalweb.portal.BaseTestSuite;
 import com.liferay.portalweb.portal.util.TearDownPageTest;
 import com.liferay.portalweb.portlet.messageboards.mbcategory.addmbcategory.AddMBCategoryTest;
 import com.liferay.portalweb.portlet.messageboards.mbcategory.addmbcategory.TearDownMBCategoryTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbcategorythreadmessage.PostNewMBCategoryThreadMessageTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbthreadmessage.TearDownMBThreadTest;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbcategorythread.PostNewMBCategoryThreadTest;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbthread.TearDownMBThreadTest;
 import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPageMBTest;
 import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPortletMBTest;
 
@@ -29,15 +29,15 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class ReplyMBCategoryThreadMessageReplyTests extends BaseTestSuite {
+public class ReplyMBCategoryThreadReplyTests extends BaseTestSuite {
 	public static Test suite() {
 		TestSuite testSuite = new TestSuite();
 		testSuite.addTestSuite(AddPageMBTest.class);
 		testSuite.addTestSuite(AddPortletMBTest.class);
 		testSuite.addTestSuite(AddMBCategoryTest.class);
-		testSuite.addTestSuite(PostNewMBCategoryThreadMessageTest.class);
-		testSuite.addTestSuite(ReplyMBCategoryThreadMessageReplyTest.class);
-		testSuite.addTestSuite(ViewMBCategoryThreadMessageReplyTest.class);
+		testSuite.addTestSuite(PostNewMBCategoryThreadTest.class);
+		testSuite.addTestSuite(ReplyMBCategoryThreadReplyTest.class);
+		testSuite.addTestSuite(ViewMBCategoryThreadReplyTest.class);
 		testSuite.addTestSuite(TearDownMBCategoryTest.class);
 		testSuite.addTestSuite(TearDownMBThreadTest.class);
 		testSuite.addTestSuite(TearDownPageTest.class);
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbcategorythreadmessagereply/ViewMBCategoryThreadMessageReplyTest.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbcategorythreadreply/ViewMBCategoryThreadReplyTest.html
similarity index 96%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbcategorythreadmessagereply/ViewMBCategoryThreadMessageReplyTest.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbcategorythreadreply/ViewMBCategoryThreadReplyTest.html
index 019647dc04c81c..153740bab51317 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbcategorythreadmessagereply/ViewMBCategoryThreadMessageReplyTest.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbcategorythreadreply/ViewMBCategoryThreadReplyTest.html
@@ -1,12 +1,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>ViewMBCategoryThreadMessageReplyTest</title>
+<title>ViewMBCategoryThreadReplyTest</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3">ViewMBCategoryThreadMessageReplyTest</td></tr>
+<tr><td rowspan="1" colspan="3">ViewMBCategoryThreadReplyTest</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbcategorythreadmessagereply/ViewMBCategoryThreadMessageReplyTest.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbcategorythreadreply/ViewMBCategoryThreadReplyTest.java
similarity index 94%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbcategorythreadmessagereply/ViewMBCategoryThreadMessageReplyTest.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbcategorythreadreply/ViewMBCategoryThreadReplyTest.java
index 2eb2a6b2811d47..dcca62a985b953 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbcategorythreadmessagereply/ViewMBCategoryThreadMessageReplyTest.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbcategorythreadreply/ViewMBCategoryThreadReplyTest.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.replymbcategorythreadmessagereply;
+package com.liferay.portalweb.portlet.messageboards.mbthread.replymbcategorythreadreply;
 
 import com.liferay.portalweb.portal.BaseTestCase;
 import com.liferay.portalweb.portal.util.RuntimeVariables;
@@ -20,9 +20,8 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class ViewMBCategoryThreadMessageReplyTest extends BaseTestCase {
-	public void testViewMBCategoryThreadMessageReply()
-		throws Exception {
+public class ViewMBCategoryThreadReplyTest extends BaseTestCase {
+	public void testViewMBCategoryThreadReply() throws Exception {
 		selenium.open("/web/guest/home/");
 		loadRequiredJavaScriptModules();
 		selenium.clickAt("link=Message Boards Test Page",
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbcategorythreadmessagereplyreply/ReplyMBCategoryThreadMessageReplyReplyTest.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbcategorythreadreplyreply/ReplyMBCategoryThreadReplyReplyTest.html
similarity index 95%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbcategorythreadmessagereplyreply/ReplyMBCategoryThreadMessageReplyReplyTest.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbcategorythreadreplyreply/ReplyMBCategoryThreadReplyReplyTest.html
index 070fb658fa10cf..eacfee0496923e 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbcategorythreadmessagereplyreply/ReplyMBCategoryThreadMessageReplyReplyTest.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbcategorythreadreplyreply/ReplyMBCategoryThreadReplyReplyTest.html
@@ -1,12 +1,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>ReplyMBCategoryThreadMessageReplyReplyTest</title>
+<title>ReplyMBCategoryThreadReplyReplyTest</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3">ReplyMBCategoryThreadMessageReplyReplyTest</td></tr>
+<tr><td rowspan="1" colspan="3">ReplyMBCategoryThreadReplyReplyTest</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbcategorythreadmessagereplyreply/ReplyMBCategoryThreadMessageReplyReplyTest.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbcategorythreadreplyreply/ReplyMBCategoryThreadReplyReplyTest.java
similarity index 95%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbcategorythreadmessagereplyreply/ReplyMBCategoryThreadMessageReplyReplyTest.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbcategorythreadreplyreply/ReplyMBCategoryThreadReplyReplyTest.java
index 71a0bcc66794e0..6bba9ad2e90756 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbcategorythreadmessagereplyreply/ReplyMBCategoryThreadMessageReplyReplyTest.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbcategorythreadreplyreply/ReplyMBCategoryThreadReplyReplyTest.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.replymbcategorythreadmessagereplyreply;
+package com.liferay.portalweb.portlet.messageboards.mbthread.replymbcategorythreadreplyreply;
 
 import com.liferay.portalweb.portal.BaseTestCase;
 import com.liferay.portalweb.portal.util.RuntimeVariables;
@@ -20,9 +20,8 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class ReplyMBCategoryThreadMessageReplyReplyTest extends BaseTestCase {
-	public void testReplyMBCategoryThreadMessageReplyReply()
-		throws Exception {
+public class ReplyMBCategoryThreadReplyReplyTest extends BaseTestCase {
+	public void testReplyMBCategoryThreadReplyReply() throws Exception {
 		selenium.open("/web/guest/home/");
 		loadRequiredJavaScriptModules();
 		selenium.clickAt("link=Message Boards Test Page",
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/splitthreadmbcategorymessagereply/SplitThreadMBCategoryMessageReplyTests.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbcategorythreadreplyreply/ReplyMBCategoryThreadReplyReplyTests.html
similarity index 69%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/splitthreadmbcategorymessagereply/SplitThreadMBCategoryMessageReplyTests.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbcategorythreadreplyreply/ReplyMBCategoryThreadReplyReplyTests.html
index 7ebf307d432ae0..f98644666fd11e 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/splitthreadmbcategorymessagereply/SplitThreadMBCategoryMessageReplyTests.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbcategorythreadreplyreply/ReplyMBCategoryThreadReplyReplyTests.html
@@ -11,12 +11,12 @@
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPageMBTest.html">AddPageMBTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPortletMBTest.html">AddPortletMBTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/AddMBCategoryTest.html">AddMBCategoryTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThreadMessageTest.html">PostNewMBCategoryThreadMessageTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/replymbcategorythreadmessagereply/ReplyMBCategoryThreadMessageReplyTest.html">ReplyMBCategoryThreadMessageReplyTest</a></td></tr>
-<tr><td><a href="SplitThreadMBCategoryMessageReplyTest.html">SplitThreadMBCategoryMessageReplyTest</a></td></tr>
-<tr><td><a href="ViewSplitThreadMBCategoryMessageReplyTest.html">ViewSplitThreadMBCategoryMessageReplyTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategoryThreadTest.html">PostNewMBCategoryThreadTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/replymbcategorythreadreply/ReplyMBCategoryThreadReplyTest.html">ReplyMBCategoryThreadReplyTest</a></td></tr>
+<tr><td><a href="ReplyMBCategoryThreadReplyReplyTest.html">ReplyMBCategoryThreadReplyReplyTest</a></td></tr>
+<tr><td><a href="ViewMBCategoryThreadReplyReplyTest.html">ViewMBCategoryThreadReplyReplyTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/TearDownMBCategoryTest.html">TearDownMBCategoryTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/postnewmbthreadmessage/TearDownMBThreadTest.html">TearDownMBThreadTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/postnewmbthread/TearDownMBThreadTest.html">TearDownMBThreadTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portal/util/TearDownPageTest.html">TearDownPageTest</a></td></tr>
 </tbody></table>
 </body>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbcategorythreadreplyreply/ReplyMBCategoryThreadReplyReplyTests.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbcategorythreadreplyreply/ReplyMBCategoryThreadReplyReplyTests.java
new file mode 100644
index 00000000000000..f7ad5161a1c82b
--- /dev/null
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbcategorythreadreplyreply/ReplyMBCategoryThreadReplyReplyTests.java
@@ -0,0 +1,49 @@
+/**
+ * Copyright (c) 2000-2012 Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package com.liferay.portalweb.portlet.messageboards.mbthread.replymbcategorythreadreplyreply;
+
+import com.liferay.portalweb.portal.BaseTestSuite;
+import com.liferay.portalweb.portal.util.TearDownPageTest;
+import com.liferay.portalweb.portlet.messageboards.mbcategory.addmbcategory.AddMBCategoryTest;
+import com.liferay.portalweb.portlet.messageboards.mbcategory.addmbcategory.TearDownMBCategoryTest;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbcategorythread.PostNewMBCategoryThreadTest;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbthread.TearDownMBThreadTest;
+import com.liferay.portalweb.portlet.messageboards.mbthread.replymbcategorythreadreply.ReplyMBCategoryThreadReplyTest;
+import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPageMBTest;
+import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPortletMBTest;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+/**
+ * @author Brian Wing Shun Chan
+ */
+public class ReplyMBCategoryThreadReplyReplyTests extends BaseTestSuite {
+	public static Test suite() {
+		TestSuite testSuite = new TestSuite();
+		testSuite.addTestSuite(AddPageMBTest.class);
+		testSuite.addTestSuite(AddPortletMBTest.class);
+		testSuite.addTestSuite(AddMBCategoryTest.class);
+		testSuite.addTestSuite(PostNewMBCategoryThreadTest.class);
+		testSuite.addTestSuite(ReplyMBCategoryThreadReplyTest.class);
+		testSuite.addTestSuite(ReplyMBCategoryThreadReplyReplyTest.class);
+		testSuite.addTestSuite(ViewMBCategoryThreadReplyReplyTest.class);
+		testSuite.addTestSuite(TearDownMBCategoryTest.class);
+		testSuite.addTestSuite(TearDownMBThreadTest.class);
+		testSuite.addTestSuite(TearDownPageTest.class);
+
+		return testSuite;
+	}
+}
\ No newline at end of file
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbcategorythreadmessagereplyreply/ViewMBCategoryThreadMessageReplyReplyTest.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbcategorythreadreplyreply/ViewMBCategoryThreadReplyReplyTest.html
similarity index 96%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbcategorythreadmessagereplyreply/ViewMBCategoryThreadMessageReplyReplyTest.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbcategorythreadreplyreply/ViewMBCategoryThreadReplyReplyTest.html
index 28924e6ec07ad6..388d093d07f66d 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbcategorythreadmessagereplyreply/ViewMBCategoryThreadMessageReplyReplyTest.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbcategorythreadreplyreply/ViewMBCategoryThreadReplyReplyTest.html
@@ -1,12 +1,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>ViewMBCategoryThreadMessageReplyReplyTest</title>
+<title>ViewMBCategoryThreadReplyReplyTest</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3">ViewMBCategoryThreadMessageReplyReplyTest</td></tr>
+<tr><td rowspan="1" colspan="3">ViewMBCategoryThreadReplyReplyTest</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbcategorythreadmessagereplyreply/ViewMBCategoryThreadMessageReplyReplyTest.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbcategorythreadreplyreply/ViewMBCategoryThreadReplyReplyTest.java
similarity index 95%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbcategorythreadmessagereplyreply/ViewMBCategoryThreadMessageReplyReplyTest.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbcategorythreadreplyreply/ViewMBCategoryThreadReplyReplyTest.java
index ce25410e3b3398..d671bf97debfe5 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbcategorythreadmessagereplyreply/ViewMBCategoryThreadMessageReplyReplyTest.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbcategorythreadreplyreply/ViewMBCategoryThreadReplyReplyTest.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.replymbcategorythreadmessagereplyreply;
+package com.liferay.portalweb.portlet.messageboards.mbthread.replymbcategorythreadreplyreply;
 
 import com.liferay.portalweb.portal.BaseTestCase;
 import com.liferay.portalweb.portal.util.RuntimeVariables;
@@ -20,9 +20,8 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class ViewMBCategoryThreadMessageReplyReplyTest extends BaseTestCase {
-	public void testViewMBCategoryThreadMessageReplyReply()
-		throws Exception {
+public class ViewMBCategoryThreadReplyReplyTest extends BaseTestCase {
+	public void testViewMBCategoryThreadReplyReply() throws Exception {
 		selenium.open("/web/guest/home/");
 		loadRequiredJavaScriptModules();
 		selenium.clickAt("link=Message Boards Test Page",
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbthreadreplies/ReplyMBThreadRepliesTests.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbthreadreplies/ReplyMBThreadRepliesTests.html
new file mode 100644
index 00000000000000..7e3755cae0e5e7
--- /dev/null
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbthreadreplies/ReplyMBThreadRepliesTests.html
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+  <meta content="text/html; charset=UTF-8" http-equiv="content-type" />
+  <title>Test Suite</title>
+</head>
+<body>
+<table id="suiteTable" cellpadding="1" cellspacing="1" border="1" class="selenium"><tbody>
+<tr><td><b>Test Suite</b></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPageMBTest.html">AddPageMBTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPortletMBTest.html">AddPortletMBTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/postnewmbthread/PostNewMBThreadTest.html">PostNewMBThreadTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/replymbthreadreply/ReplyMBThreadReply1Test.html">ReplyMBThreadReply1Test</a></td></tr>
+<tr><td><a href="ViewMBThreadReply1Test.html">ViewMBThreadReply1Test</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/replymbthreadreply/ReplyMBThreadReply2Test.html">ReplyMBThreadReply2Test</a></td></tr>
+<tr><td><a href="ViewMBThreadReply2Test.html">ViewMBThreadReply2Test</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/replymbthreadreply/ReplyMBThreadReply3Test.html">ReplyMBThreadReply3Test</a></td></tr>
+<tr><td><a href="ViewMBThreadReply3Test.html">ViewMBThreadReply3Test</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/postnewmbthread/TearDownMBThreadTest.html">TearDownMBThreadTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portal/util/TearDownPageTest.html">TearDownPageTest</a></td></tr>
+</tbody></table>
+</body>
+</html>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbthreadsmessage/PostNewMBThreadsMessageTests.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbthreadreplies/ReplyMBThreadRepliesTests.java
similarity index 55%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbthreadsmessage/PostNewMBThreadsMessageTests.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbthreadreplies/ReplyMBThreadRepliesTests.java
index b3bd0661192c5e..76e516f7a2a1dd 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbthreadsmessage/PostNewMBThreadsMessageTests.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbthreadreplies/ReplyMBThreadRepliesTests.java
@@ -12,14 +12,15 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbthreadsmessage;
+package com.liferay.portalweb.portlet.messageboards.mbthread.replymbthreadreplies;
 
 import com.liferay.portalweb.portal.BaseTestSuite;
 import com.liferay.portalweb.portal.util.TearDownPageTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbthreadmessage.PostNewMBThread1MessageTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbthreadmessage.PostNewMBThread2MessageTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbthreadmessage.PostNewMBThread3MessageTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbthreadmessage.TearDownMBThreadTest;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbthread.PostNewMBThreadTest;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbthread.TearDownMBThreadTest;
+import com.liferay.portalweb.portlet.messageboards.mbthread.replymbthreadreply.ReplyMBThreadReply1Test;
+import com.liferay.portalweb.portlet.messageboards.mbthread.replymbthreadreply.ReplyMBThreadReply2Test;
+import com.liferay.portalweb.portlet.messageboards.mbthread.replymbthreadreply.ReplyMBThreadReply3Test;
 import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPageMBTest;
 import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPortletMBTest;
 
@@ -29,17 +30,18 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class PostNewMBThreadsMessageTests extends BaseTestSuite {
+public class ReplyMBThreadRepliesTests extends BaseTestSuite {
 	public static Test suite() {
 		TestSuite testSuite = new TestSuite();
 		testSuite.addTestSuite(AddPageMBTest.class);
 		testSuite.addTestSuite(AddPortletMBTest.class);
-		testSuite.addTestSuite(PostNewMBThread1MessageTest.class);
-		testSuite.addTestSuite(PostNewMBThread2MessageTest.class);
-		testSuite.addTestSuite(PostNewMBThread3MessageTest.class);
-		testSuite.addTestSuite(ViewMBThread1MessageTest.class);
-		testSuite.addTestSuite(ViewMBThread2MessageTest.class);
-		testSuite.addTestSuite(ViewMBThread3MessageTest.class);
+		testSuite.addTestSuite(PostNewMBThreadTest.class);
+		testSuite.addTestSuite(ReplyMBThreadReply1Test.class);
+		testSuite.addTestSuite(ViewMBThreadReply1Test.class);
+		testSuite.addTestSuite(ReplyMBThreadReply2Test.class);
+		testSuite.addTestSuite(ViewMBThreadReply2Test.class);
+		testSuite.addTestSuite(ReplyMBThreadReply3Test.class);
+		testSuite.addTestSuite(ViewMBThreadReply3Test.class);
 		testSuite.addTestSuite(TearDownMBThreadTest.class);
 		testSuite.addTestSuite(TearDownPageTest.class);
 
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbthreadmessagereplies/ViewMBThreadMessageReply1Test.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbthreadreplies/ViewMBThreadReply1Test.html
similarity index 92%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbthreadmessagereplies/ViewMBThreadMessageReply1Test.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbthreadreplies/ViewMBThreadReply1Test.html
index 994ac70f46f7f1..f1e2d7956cc979 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbthreadmessagereplies/ViewMBThreadMessageReply1Test.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbthreadreplies/ViewMBThreadReply1Test.html
@@ -1,12 +1,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>ViewMBThreadMessageReply1Test</title>
+<title>ViewMBThreadReply1Test</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3">ViewMBThreadMessageReply1Test</td></tr>
+<tr><td rowspan="1" colspan="3">ViewMBThreadReply1Test</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbthreadmessagereplies/ViewMBThreadMessageReply1Test.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbthreadreplies/ViewMBThreadReply1Test.java
similarity index 91%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbthreadmessagereplies/ViewMBThreadMessageReply1Test.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbthreadreplies/ViewMBThreadReply1Test.java
index b5d5ea1330c594..0613c6a7f992bf 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbthreadmessagereplies/ViewMBThreadMessageReply1Test.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbthreadreplies/ViewMBThreadReply1Test.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.replymbthreadmessagereplies;
+package com.liferay.portalweb.portlet.messageboards.mbthread.replymbthreadreplies;
 
 import com.liferay.portalweb.portal.BaseTestCase;
 import com.liferay.portalweb.portal.util.RuntimeVariables;
@@ -20,8 +20,8 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class ViewMBThreadMessageReply1Test extends BaseTestCase {
-	public void testViewMBThreadMessageReply1() throws Exception {
+public class ViewMBThreadReply1Test extends BaseTestCase {
+	public void testViewMBThreadReply1() throws Exception {
 		selenium.open("/web/guest/home/");
 		loadRequiredJavaScriptModules();
 		selenium.clickAt("link=Message Boards Test Page",
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbthreadmessagereplies/ViewMBThreadMessageReply2Test.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbthreadreplies/ViewMBThreadReply2Test.html
similarity index 93%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbthreadmessagereplies/ViewMBThreadMessageReply2Test.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbthreadreplies/ViewMBThreadReply2Test.html
index d4664f96216347..4e0923f69b6b77 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbthreadmessagereplies/ViewMBThreadMessageReply2Test.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbthreadreplies/ViewMBThreadReply2Test.html
@@ -1,12 +1,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>ViewMBThreadMessageReply2Test</title>
+<title>ViewMBThreadReply2Test</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3">ViewMBThreadMessageReply2Test</td></tr>
+<tr><td rowspan="1" colspan="3">ViewMBThreadReply2Test</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbthreadmessagereplies/ViewMBThreadMessageReply2Test.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbthreadreplies/ViewMBThreadReply2Test.java
similarity index 92%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbthreadmessagereplies/ViewMBThreadMessageReply2Test.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbthreadreplies/ViewMBThreadReply2Test.java
index 910c88ff8fb6b7..8c6a5e2d64d905 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbthreadmessagereplies/ViewMBThreadMessageReply2Test.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbthreadreplies/ViewMBThreadReply2Test.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.replymbthreadmessagereplies;
+package com.liferay.portalweb.portlet.messageboards.mbthread.replymbthreadreplies;
 
 import com.liferay.portalweb.portal.BaseTestCase;
 import com.liferay.portalweb.portal.util.RuntimeVariables;
@@ -20,8 +20,8 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class ViewMBThreadMessageReply2Test extends BaseTestCase {
-	public void testViewMBThreadMessageReply2() throws Exception {
+public class ViewMBThreadReply2Test extends BaseTestCase {
+	public void testViewMBThreadReply2() throws Exception {
 		selenium.open("/web/guest/home/");
 		loadRequiredJavaScriptModules();
 		selenium.clickAt("link=Message Boards Test Page",
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbthreadmessagereplies/ViewMBThreadMessageReply3Test.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbthreadreplies/ViewMBThreadReply3Test.html
similarity index 94%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbthreadmessagereplies/ViewMBThreadMessageReply3Test.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbthreadreplies/ViewMBThreadReply3Test.html
index c724bff0c6988e..db7890a2c7f0cf 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbthreadmessagereplies/ViewMBThreadMessageReply3Test.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbthreadreplies/ViewMBThreadReply3Test.html
@@ -1,12 +1,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>ViewMBThreadMessageReply3Test</title>
+<title>ViewMBThreadReply3Test</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3">ViewMBThreadMessageReply3Test</td></tr>
+<tr><td rowspan="1" colspan="3">ViewMBThreadReply3Test</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbthreadmessagereplies/ViewMBThreadMessageReply3Test.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbthreadreplies/ViewMBThreadReply3Test.java
similarity index 92%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbthreadmessagereplies/ViewMBThreadMessageReply3Test.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbthreadreplies/ViewMBThreadReply3Test.java
index 93185c44ba1c86..b7545e07da09ed 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbthreadmessagereplies/ViewMBThreadMessageReply3Test.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbthreadreplies/ViewMBThreadReply3Test.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.replymbthreadmessagereplies;
+package com.liferay.portalweb.portlet.messageboards.mbthread.replymbthreadreplies;
 
 import com.liferay.portalweb.portal.BaseTestCase;
 import com.liferay.portalweb.portal.util.RuntimeVariables;
@@ -20,8 +20,8 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class ViewMBThreadMessageReply3Test extends BaseTestCase {
-	public void testViewMBThreadMessageReply3() throws Exception {
+public class ViewMBThreadReply3Test extends BaseTestCase {
+	public void testViewMBThreadReply3() throws Exception {
 		selenium.open("/web/guest/home/");
 		loadRequiredJavaScriptModules();
 		selenium.clickAt("link=Message Boards Test Page",
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbthreadmessagereply/ReplyMBThreadMessageReply1Test.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbthreadreply/ReplyMBThreadReply1Test.html
similarity index 95%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbthreadmessagereply/ReplyMBThreadMessageReply1Test.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbthreadreply/ReplyMBThreadReply1Test.html
index ce029d539f9fc9..cfe4b94c631c2b 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbthreadmessagereply/ReplyMBThreadMessageReply1Test.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbthreadreply/ReplyMBThreadReply1Test.html
@@ -1,12 +1,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>ReplyMBThreadMessageReply1Test</title>
+<title>ReplyMBThreadReply1Test</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3">ReplyMBThreadMessageReply1Test</td></tr>
+<tr><td rowspan="1" colspan="3">ReplyMBThreadReply1Test</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbthreadmessagereply/ReplyMBThreadMessageReply1Test.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbthreadreply/ReplyMBThreadReply1Test.java
similarity index 95%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbthreadmessagereply/ReplyMBThreadMessageReply1Test.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbthreadreply/ReplyMBThreadReply1Test.java
index 1a470da690206f..e75e34f5c1d51d 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbthreadmessagereply/ReplyMBThreadMessageReply1Test.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbthreadreply/ReplyMBThreadReply1Test.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.replymbthreadmessagereply;
+package com.liferay.portalweb.portlet.messageboards.mbthread.replymbthreadreply;
 
 import com.liferay.portalweb.portal.BaseTestCase;
 import com.liferay.portalweb.portal.util.RuntimeVariables;
@@ -20,8 +20,8 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class ReplyMBThreadMessageReply1Test extends BaseTestCase {
-	public void testReplyMBThreadMessageReply1() throws Exception {
+public class ReplyMBThreadReply1Test extends BaseTestCase {
+	public void testReplyMBThreadReply1() throws Exception {
 		selenium.open("/web/guest/home/");
 		loadRequiredJavaScriptModules();
 		selenium.clickAt("link=Message Boards Test Page",
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbthreadmessagereply/ReplyMBThreadMessageReply2Test.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbthreadreply/ReplyMBThreadReply2Test.html
similarity index 95%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbthreadmessagereply/ReplyMBThreadMessageReply2Test.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbthreadreply/ReplyMBThreadReply2Test.html
index 6ac77409810cab..e20867c6c7d6f3 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbthreadmessagereply/ReplyMBThreadMessageReply2Test.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbthreadreply/ReplyMBThreadReply2Test.html
@@ -1,12 +1,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>ReplyMBThreadMessageReply2Test</title>
+<title>ReplyMBThreadReply2Test</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3">ReplyMBThreadMessageReply2Test</td></tr>
+<tr><td rowspan="1" colspan="3">ReplyMBThreadReply2Test</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbthreadmessagereply/ReplyMBThreadMessageReply2Test.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbthreadreply/ReplyMBThreadReply2Test.java
similarity index 95%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbthreadmessagereply/ReplyMBThreadMessageReply2Test.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbthreadreply/ReplyMBThreadReply2Test.java
index 420eede523855f..1ad673298c9008 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbthreadmessagereply/ReplyMBThreadMessageReply2Test.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbthreadreply/ReplyMBThreadReply2Test.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.replymbthreadmessagereply;
+package com.liferay.portalweb.portlet.messageboards.mbthread.replymbthreadreply;
 
 import com.liferay.portalweb.portal.BaseTestCase;
 import com.liferay.portalweb.portal.util.RuntimeVariables;
@@ -20,8 +20,8 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class ReplyMBThreadMessageReply2Test extends BaseTestCase {
-	public void testReplyMBThreadMessageReply2() throws Exception {
+public class ReplyMBThreadReply2Test extends BaseTestCase {
+	public void testReplyMBThreadReply2() throws Exception {
 		selenium.open("/web/guest/home/");
 		loadRequiredJavaScriptModules();
 		selenium.clickAt("link=Message Boards Test Page",
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbthreadmessagereply/ReplyMBThreadMessageReply3Test.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbthreadreply/ReplyMBThreadReply3Test.html
similarity index 95%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbthreadmessagereply/ReplyMBThreadMessageReply3Test.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbthreadreply/ReplyMBThreadReply3Test.html
index 4f2a426f3f6ab0..8583b7eaf76668 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbthreadmessagereply/ReplyMBThreadMessageReply3Test.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbthreadreply/ReplyMBThreadReply3Test.html
@@ -1,12 +1,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>ReplyMBThreadMessageReply3Test</title>
+<title>ReplyMBThreadReply3Test</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3">ReplyMBThreadMessageReply3Test</td></tr>
+<tr><td rowspan="1" colspan="3">ReplyMBThreadReply3Test</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbthreadmessagereply/ReplyMBThreadMessageReply3Test.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbthreadreply/ReplyMBThreadReply3Test.java
similarity index 95%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbthreadmessagereply/ReplyMBThreadMessageReply3Test.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbthreadreply/ReplyMBThreadReply3Test.java
index 6e900a35064548..8814c855202bdb 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbthreadmessagereply/ReplyMBThreadMessageReply3Test.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbthreadreply/ReplyMBThreadReply3Test.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.replymbthreadmessagereply;
+package com.liferay.portalweb.portlet.messageboards.mbthread.replymbthreadreply;
 
 import com.liferay.portalweb.portal.BaseTestCase;
 import com.liferay.portalweb.portal.util.RuntimeVariables;
@@ -20,8 +20,8 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class ReplyMBThreadMessageReply3Test extends BaseTestCase {
-	public void testReplyMBThreadMessageReply3() throws Exception {
+public class ReplyMBThreadReply3Test extends BaseTestCase {
+	public void testReplyMBThreadReply3() throws Exception {
 		selenium.open("/web/guest/home/");
 		loadRequiredJavaScriptModules();
 		selenium.clickAt("link=Message Boards Test Page",
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbthreadmessagereply/ReplyMBThreadMessageReplyTest.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbthreadreply/ReplyMBThreadReplyTest.html
similarity index 95%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbthreadmessagereply/ReplyMBThreadMessageReplyTest.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbthreadreply/ReplyMBThreadReplyTest.html
index 0a1648655205bd..f328ca3ef0ef2f 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbthreadmessagereply/ReplyMBThreadMessageReplyTest.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbthreadreply/ReplyMBThreadReplyTest.html
@@ -1,12 +1,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>ReplyMBThreadMessageReplyTest</title>
+<title>ReplyMBThreadReplyTest</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3">ReplyMBThreadMessageReplyTest</td></tr>
+<tr><td rowspan="1" colspan="3">ReplyMBThreadReplyTest</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbthreadmessagereply/ReplyMBThreadMessageReplyTest.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbthreadreply/ReplyMBThreadReplyTest.java
similarity index 95%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbthreadmessagereply/ReplyMBThreadMessageReplyTest.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbthreadreply/ReplyMBThreadReplyTest.java
index 689c7bf937e978..6a8b02c7b0492f 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbthreadmessagereply/ReplyMBThreadMessageReplyTest.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbthreadreply/ReplyMBThreadReplyTest.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.replymbthreadmessagereply;
+package com.liferay.portalweb.portlet.messageboards.mbthread.replymbthreadreply;
 
 import com.liferay.portalweb.portal.BaseTestCase;
 import com.liferay.portalweb.portal.util.RuntimeVariables;
@@ -20,8 +20,8 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class ReplyMBThreadMessageReplyTest extends BaseTestCase {
-	public void testReplyMBThreadMessageReply() throws Exception {
+public class ReplyMBThreadReplyTest extends BaseTestCase {
+	public void testReplyMBThreadReply() throws Exception {
 		selenium.open("/web/guest/home/");
 		loadRequiredJavaScriptModules();
 		selenium.clickAt("link=Message Boards Test Page",
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbthreadmessagereply/ReplyMBThreadMessageReplyTests.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbthreadreply/ReplyMBThreadReplyTests.html
similarity index 71%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbthreadmessagereply/ReplyMBThreadMessageReplyTests.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbthreadreply/ReplyMBThreadReplyTests.html
index 34abea4981598d..162d8077dbb061 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbthreadmessagereply/ReplyMBThreadMessageReplyTests.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbthreadreply/ReplyMBThreadReplyTests.html
@@ -10,10 +10,10 @@
 <tr><td><b>Test Suite</b></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPageMBTest.html">AddPageMBTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPortletMBTest.html">AddPortletMBTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/postnewmbthreadmessage/PostNewMBThreadMessageTest.html">PostNewMBThreadMessageTest</a></td></tr>
-<tr><td><a href="ReplyMBThreadMessageReplyTest.html">ReplyMBThreadMessageReplyTest</a></td></tr>
-<tr><td><a href="ViewMBThreadMessageReplyTest.html">ViewMBThreadMessageReplyTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/postnewmbthreadmessage/TearDownMBThreadTest.html">TearDownMBThreadTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/postnewmbthread/PostNewMBThreadTest.html">PostNewMBThreadTest</a></td></tr>
+<tr><td><a href="ReplyMBThreadReplyTest.html">ReplyMBThreadReplyTest</a></td></tr>
+<tr><td><a href="ViewMBThreadReplyTest.html">ViewMBThreadReplyTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/postnewmbthread/TearDownMBThreadTest.html">TearDownMBThreadTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portal/util/TearDownPageTest.html">TearDownPageTest</a></td></tr>
 </tbody></table>
 </body>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbthreadmessagereply/ReplyMBThreadMessageReplyTests.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbthreadreply/ReplyMBThreadReplyTests.java
similarity index 69%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbthreadmessagereply/ReplyMBThreadMessageReplyTests.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbthreadreply/ReplyMBThreadReplyTests.java
index f150858a16ed92..d2f071dadbe119 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbthreadmessagereply/ReplyMBThreadMessageReplyTests.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbthreadreply/ReplyMBThreadReplyTests.java
@@ -12,12 +12,12 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.replymbthreadmessagereply;
+package com.liferay.portalweb.portlet.messageboards.mbthread.replymbthreadreply;
 
 import com.liferay.portalweb.portal.BaseTestSuite;
 import com.liferay.portalweb.portal.util.TearDownPageTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbthreadmessage.PostNewMBThreadMessageTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbthreadmessage.TearDownMBThreadTest;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbthread.PostNewMBThreadTest;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbthread.TearDownMBThreadTest;
 import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPageMBTest;
 import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPortletMBTest;
 
@@ -27,14 +27,14 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class ReplyMBThreadMessageReplyTests extends BaseTestSuite {
+public class ReplyMBThreadReplyTests extends BaseTestSuite {
 	public static Test suite() {
 		TestSuite testSuite = new TestSuite();
 		testSuite.addTestSuite(AddPageMBTest.class);
 		testSuite.addTestSuite(AddPortletMBTest.class);
-		testSuite.addTestSuite(PostNewMBThreadMessageTest.class);
-		testSuite.addTestSuite(ReplyMBThreadMessageReplyTest.class);
-		testSuite.addTestSuite(ViewMBThreadMessageReplyTest.class);
+		testSuite.addTestSuite(PostNewMBThreadTest.class);
+		testSuite.addTestSuite(ReplyMBThreadReplyTest.class);
+		testSuite.addTestSuite(ViewMBThreadReplyTest.class);
 		testSuite.addTestSuite(TearDownMBThreadTest.class);
 		testSuite.addTestSuite(TearDownPageTest.class);
 
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbthreadmessagereply/ViewMBThreadMessageReplyTest.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbthreadreply/ViewMBThreadReplyTest.html
similarity index 96%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbthreadmessagereply/ViewMBThreadMessageReplyTest.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbthreadreply/ViewMBThreadReplyTest.html
index 5c6084fe37e3de..e09815e7e7f3e2 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbthreadmessagereply/ViewMBThreadMessageReplyTest.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbthreadreply/ViewMBThreadReplyTest.html
@@ -1,12 +1,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>ViewMBThreadMessageReplyTest</title>
+<title>ViewMBThreadReplyTest</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3">ViewMBThreadMessageReplyTest</td></tr>
+<tr><td rowspan="1" colspan="3">ViewMBThreadReplyTest</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbthreadmessagereply/ViewMBThreadMessageReplyTest.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbthreadreply/ViewMBThreadReplyTest.java
similarity index 94%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbthreadmessagereply/ViewMBThreadMessageReplyTest.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbthreadreply/ViewMBThreadReplyTest.java
index 1d3b13d2acb89b..5ac8a7d5f55369 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbthreadmessagereply/ViewMBThreadMessageReplyTest.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/replymbthreadreply/ViewMBThreadReplyTest.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.replymbthreadmessagereply;
+package com.liferay.portalweb.portlet.messageboards.mbthread.replymbthreadreply;
 
 import com.liferay.portalweb.portal.BaseTestCase;
 import com.liferay.portalweb.portal.util.RuntimeVariables;
@@ -20,8 +20,8 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class ViewMBThreadMessageReplyTest extends BaseTestCase {
-	public void testViewMBThreadMessageReply() throws Exception {
+public class ViewMBThreadReplyTest extends BaseTestCase {
+	public void testViewMBThreadReply() throws Exception {
 		selenium.open("/web/guest/home/");
 		loadRequiredJavaScriptModules();
 		selenium.clickAt("link=Message Boards Test Page",
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/searchmbcategorymessage/SearchMBCategoryMessageQuotesTest.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/searchmbcategorythread/SearchMBCategoryThreadQuotesTest.html
similarity index 91%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/searchmbcategorymessage/SearchMBCategoryMessageQuotesTest.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/searchmbcategorythread/SearchMBCategoryThreadQuotesTest.html
index 80b8deabbb9e1a..0a386b6af936c0 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/searchmbcategorymessage/SearchMBCategoryMessageQuotesTest.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/searchmbcategorythread/SearchMBCategoryThreadQuotesTest.html
@@ -1,12 +1,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>SearchMBCategoryMessageQuotesTest</title>
+<title>SearchMBCategoryThreadQuotesTest</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3">SearchMBCategoryMessageQuotesTest</td></tr>
+<tr><td rowspan="1" colspan="3">SearchMBCategoryThreadQuotesTest</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/searchmbcategorymessage/SearchMBCategoryMessageQuotesTest.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/searchmbcategorythread/SearchMBCategoryThreadQuotesTest.java
similarity index 91%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/searchmbcategorymessage/SearchMBCategoryMessageQuotesTest.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/searchmbcategorythread/SearchMBCategoryThreadQuotesTest.java
index 2855e229fee02b..3a2a19b3353e98 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/searchmbcategorymessage/SearchMBCategoryMessageQuotesTest.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/searchmbcategorythread/SearchMBCategoryThreadQuotesTest.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.searchmbcategorymessage;
+package com.liferay.portalweb.portlet.messageboards.mbthread.searchmbcategorythread;
 
 import com.liferay.portalweb.portal.BaseTestCase;
 import com.liferay.portalweb.portal.util.RuntimeVariables;
@@ -20,8 +20,8 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class SearchMBCategoryMessageQuotesTest extends BaseTestCase {
-	public void testSearchMBCategoryMessageQuotes() throws Exception {
+public class SearchMBCategoryThreadQuotesTest extends BaseTestCase {
+	public void testSearchMBCategoryThreadQuotes() throws Exception {
 		selenium.open("/web/guest/home/");
 		loadRequiredJavaScriptModules();
 
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/searchmbcategorymessage/SearchMBCategoryMessageTest.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/searchmbcategorythread/SearchMBCategoryThreadTest.html
similarity index 91%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/searchmbcategorymessage/SearchMBCategoryMessageTest.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/searchmbcategorythread/SearchMBCategoryThreadTest.html
index 2afcc82ceff962..9fed6a9ecd89f2 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/searchmbcategorymessage/SearchMBCategoryMessageTest.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/searchmbcategorythread/SearchMBCategoryThreadTest.html
@@ -1,12 +1,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>SearchMBCategoryMessageTest</title>
+<title>SearchMBCategoryThreadTest</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3">SearchMBCategoryMessageTest</td></tr>
+<tr><td rowspan="1" colspan="3">SearchMBCategoryThreadTest</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/searchmbcategorymessage/SearchMBCategoryMessageTest.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/searchmbcategorythread/SearchMBCategoryThreadTest.java
similarity index 92%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/searchmbcategorymessage/SearchMBCategoryMessageTest.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/searchmbcategorythread/SearchMBCategoryThreadTest.java
index 5c1c048356621c..1195879fa913fc 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/searchmbcategorymessage/SearchMBCategoryMessageTest.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/searchmbcategorythread/SearchMBCategoryThreadTest.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.searchmbcategorymessage;
+package com.liferay.portalweb.portlet.messageboards.mbthread.searchmbcategorythread;
 
 import com.liferay.portalweb.portal.BaseTestCase;
 import com.liferay.portalweb.portal.util.RuntimeVariables;
@@ -20,8 +20,8 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class SearchMBCategoryMessageTest extends BaseTestCase {
-	public void testSearchMBCategoryMessage() throws Exception {
+public class SearchMBCategoryThreadTest extends BaseTestCase {
+	public void testSearchMBCategoryThread() throws Exception {
 		selenium.open("/web/guest/home/");
 		loadRequiredJavaScriptModules();
 
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/searchmbcategorythread/SearchMBCategoryThreadTests.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/searchmbcategorythread/SearchMBCategoryThreadTests.html
new file mode 100644
index 00000000000000..71b9e0ac70b9ad
--- /dev/null
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/searchmbcategorythread/SearchMBCategoryThreadTests.html
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+  <meta content="text/html; charset=UTF-8" http-equiv="content-type" />
+  <title>SearchMBCategoryThreadTests</title>
+</head>
+<body>
+<table id="suiteTable" cellpadding="1" cellspacing="1" border="1" class="selenium"><tbody>
+<tr><td><b>SearchMBCategoryThreadTests</b></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPageMBTest.html">AddPageMBTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPortletMBTest.html">AddPortletMBTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/AddMBCategoryTest.html">AddMBCategoryTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategoryThreadTest.html">PostNewMBCategoryThreadTest</a></td></tr>
+<tr><td><a href="SearchMBCategoryThreadTest.html">SearchMBCategoryThreadTest</a></td></tr>
+<tr><td><a href="SearchMBCategoryThreadQuotesTest.html">SearchMBCategoryThreadQuotesTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/TearDownMBCategoryTest.html">TearDownMBCategoryTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portal/util/TearDownPageTest.html">TearDownPageTest</a></td></tr>
+</tbody></table>
+</body>
+</html>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/editmbcategorymessagesubject/EditMBCategoryMessageSubjectTests.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/searchmbcategorythread/SearchMBCategoryThreadTests.java
similarity index 77%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/editmbcategorymessagesubject/EditMBCategoryMessageSubjectTests.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/searchmbcategorythread/SearchMBCategoryThreadTests.java
index 72e3f74ee129d9..85b781647cc473 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/editmbcategorymessagesubject/EditMBCategoryMessageSubjectTests.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/searchmbcategorythread/SearchMBCategoryThreadTests.java
@@ -12,13 +12,13 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.editmbcategorymessagesubject;
+package com.liferay.portalweb.portlet.messageboards.mbthread.searchmbcategorythread;
 
 import com.liferay.portalweb.portal.BaseTestSuite;
 import com.liferay.portalweb.portal.util.TearDownPageTest;
 import com.liferay.portalweb.portlet.messageboards.mbcategory.addmbcategory.AddMBCategoryTest;
 import com.liferay.portalweb.portlet.messageboards.mbcategory.addmbcategory.TearDownMBCategoryTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbcategorythreadmessage.PostNewMBCategoryThreadMessageTest;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbcategorythread.PostNewMBCategoryThreadTest;
 import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPageMBTest;
 import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPortletMBTest;
 
@@ -28,14 +28,15 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class EditMBCategoryMessageSubjectTests extends BaseTestSuite {
+public class SearchMBCategoryThreadTests extends BaseTestSuite {
 	public static Test suite() {
 		TestSuite testSuite = new TestSuite();
 		testSuite.addTestSuite(AddPageMBTest.class);
 		testSuite.addTestSuite(AddPortletMBTest.class);
 		testSuite.addTestSuite(AddMBCategoryTest.class);
-		testSuite.addTestSuite(PostNewMBCategoryThreadMessageTest.class);
-		testSuite.addTestSuite(EditMBCategoryMessageSubjectTest.class);
+		testSuite.addTestSuite(PostNewMBCategoryThreadTest.class);
+		testSuite.addTestSuite(SearchMBCategoryThreadTest.class);
+		testSuite.addTestSuite(SearchMBCategoryThreadQuotesTest.class);
 		testSuite.addTestSuite(TearDownMBCategoryTest.class);
 		testSuite.addTestSuite(TearDownPageTest.class);
 
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/splitthreadmbcategorymessagereply/SplitThreadMBCategoryMessageReplyTest.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/splitthreadmbcategorythreadreply/SplitThreadMBCategoryThreadReplyTest.html
similarity index 94%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/splitthreadmbcategorymessagereply/SplitThreadMBCategoryMessageReplyTest.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/splitthreadmbcategorythreadreply/SplitThreadMBCategoryThreadReplyTest.html
index 3ee120e0049e04..6ca3d07cfeef9d 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/splitthreadmbcategorymessagereply/SplitThreadMBCategoryMessageReplyTest.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/splitthreadmbcategorythreadreply/SplitThreadMBCategoryThreadReplyTest.html
@@ -1,12 +1,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>SplitThreadMBCategoryMessageReplyTest</title>
+<title>SplitThreadMBCategoryThreadReplyTest</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3">SplitThreadMBCategoryMessageReplyTest</td></tr>
+<tr><td rowspan="1" colspan="3">SplitThreadMBCategoryThreadReplyTest</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/splitthreadmbcategorymessagereply/SplitThreadMBCategoryMessageReplyTest.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/splitthreadmbcategorythreadreply/SplitThreadMBCategoryThreadReplyTest.java
similarity index 93%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/splitthreadmbcategorymessagereply/SplitThreadMBCategoryMessageReplyTest.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/splitthreadmbcategorythreadreply/SplitThreadMBCategoryThreadReplyTest.java
index 2b2bd170aa9c04..534493fcb30737 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/splitthreadmbcategorymessagereply/SplitThreadMBCategoryMessageReplyTest.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/splitthreadmbcategorythreadreply/SplitThreadMBCategoryThreadReplyTest.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.splitthreadmbcategorymessagereply;
+package com.liferay.portalweb.portlet.messageboards.mbthread.splitthreadmbcategorythreadreply;
 
 import com.liferay.portalweb.portal.BaseTestCase;
 import com.liferay.portalweb.portal.util.RuntimeVariables;
@@ -20,8 +20,8 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class SplitThreadMBCategoryMessageReplyTest extends BaseTestCase {
-	public void testSplitThreadMBCategoryMessageReply()
+public class SplitThreadMBCategoryThreadReplyTest extends BaseTestCase {
+	public void testSplitThreadMBCategoryThreadReply()
 		throws Exception {
 		selenium.open("/web/guest/home/");
 		loadRequiredJavaScriptModules();
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbcategorythreadmessagereplyreply/ReplyMBCategoryThreadMessageReplyReplyTests.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/splitthreadmbcategorythreadreply/SplitThreadMBCategoryThreadReplyTests.html
similarity index 69%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbcategorythreadmessagereplyreply/ReplyMBCategoryThreadMessageReplyReplyTests.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/splitthreadmbcategorythreadreply/SplitThreadMBCategoryThreadReplyTests.html
index 95a1b3353b2cb2..4a22ce96bb8cc2 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbcategorythreadmessagereplyreply/ReplyMBCategoryThreadMessageReplyReplyTests.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/splitthreadmbcategorythreadreply/SplitThreadMBCategoryThreadReplyTests.html
@@ -11,12 +11,12 @@
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPageMBTest.html">AddPageMBTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPortletMBTest.html">AddPortletMBTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/AddMBCategoryTest.html">AddMBCategoryTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThreadMessageTest.html">PostNewMBCategoryThreadMessageTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/replymbcategorythreadmessagereply/ReplyMBCategoryThreadMessageReplyTest.html">ReplyMBCategoryThreadMessageReplyTest</a></td></tr>
-<tr><td><a href="ReplyMBCategoryThreadMessageReplyReplyTest.html">ReplyMBCategoryThreadMessageReplyReplyTest</a></td></tr>
-<tr><td><a href="ViewMBCategoryThreadMessageReplyReplyTest.html">ViewMBCategoryThreadMessageReplyReplyTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategoryThreadTest.html">PostNewMBCategoryThreadTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/replymbcategorythreadreply/ReplyMBCategoryThreadReplyTest.html">ReplyMBCategoryThreadReplyTest</a></td></tr>
+<tr><td><a href="SplitThreadMBCategoryThreadReplyTest.html">SplitThreadMBCategoryThreadReplyTest</a></td></tr>
+<tr><td><a href="ViewSplitThreadMBCategoryThreadReplyTest.html">ViewSplitThreadMBCategoryThreadReplyTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/TearDownMBCategoryTest.html">TearDownMBCategoryTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/postnewmbthreadmessage/TearDownMBThreadTest.html">TearDownMBThreadTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/postnewmbthread/TearDownMBThreadTest.html">TearDownMBThreadTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portal/util/TearDownPageTest.html">TearDownPageTest</a></td></tr>
 </tbody></table>
 </body>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/editmbcategorymessagesubjectnull/EditMBCategoryMessageSubjectNullTests.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/splitthreadmbcategorythreadreply/SplitThreadMBCategoryThreadReplyTests.java
similarity index 65%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/editmbcategorymessagesubjectnull/EditMBCategoryMessageSubjectNullTests.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/splitthreadmbcategorythreadreply/SplitThreadMBCategoryThreadReplyTests.java
index d0d5e8d8e1c614..643f7f41eb89eb 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/editmbcategorymessagesubjectnull/EditMBCategoryMessageSubjectNullTests.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/splitthreadmbcategorythreadreply/SplitThreadMBCategoryThreadReplyTests.java
@@ -12,13 +12,15 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.editmbcategorymessagesubjectnull;
+package com.liferay.portalweb.portlet.messageboards.mbthread.splitthreadmbcategorythreadreply;
 
 import com.liferay.portalweb.portal.BaseTestSuite;
 import com.liferay.portalweb.portal.util.TearDownPageTest;
 import com.liferay.portalweb.portlet.messageboards.mbcategory.addmbcategory.AddMBCategoryTest;
 import com.liferay.portalweb.portlet.messageboards.mbcategory.addmbcategory.TearDownMBCategoryTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbcategorythreadmessage.PostNewMBCategoryThreadMessageTest;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbcategorythread.PostNewMBCategoryThreadTest;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbthread.TearDownMBThreadTest;
+import com.liferay.portalweb.portlet.messageboards.mbthread.replymbcategorythreadreply.ReplyMBCategoryThreadReplyTest;
 import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPageMBTest;
 import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPortletMBTest;
 
@@ -28,15 +30,18 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class EditMBCategoryMessageSubjectNullTests extends BaseTestSuite {
+public class SplitThreadMBCategoryThreadReplyTests extends BaseTestSuite {
 	public static Test suite() {
 		TestSuite testSuite = new TestSuite();
 		testSuite.addTestSuite(AddPageMBTest.class);
 		testSuite.addTestSuite(AddPortletMBTest.class);
 		testSuite.addTestSuite(AddMBCategoryTest.class);
-		testSuite.addTestSuite(PostNewMBCategoryThreadMessageTest.class);
-		testSuite.addTestSuite(EditMBCategoryMessageSubjectNullTest.class);
+		testSuite.addTestSuite(PostNewMBCategoryThreadTest.class);
+		testSuite.addTestSuite(ReplyMBCategoryThreadReplyTest.class);
+		testSuite.addTestSuite(SplitThreadMBCategoryThreadReplyTest.class);
+		testSuite.addTestSuite(ViewSplitThreadMBCategoryThreadReplyTest.class);
 		testSuite.addTestSuite(TearDownMBCategoryTest.class);
+		testSuite.addTestSuite(TearDownMBThreadTest.class);
 		testSuite.addTestSuite(TearDownPageTest.class);
 
 		return testSuite;
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/splitthreadmbcategorymessagereply/ViewSplitThreadMBCategoryMessageReplyTest.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/splitthreadmbcategorythreadreply/ViewSplitThreadMBCategoryThreadReplyTest.html
similarity index 95%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/splitthreadmbcategorymessagereply/ViewSplitThreadMBCategoryMessageReplyTest.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/splitthreadmbcategorythreadreply/ViewSplitThreadMBCategoryThreadReplyTest.html
index 2daddcbb374987..ae4a0a1f6d19df 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/splitthreadmbcategorymessagereply/ViewSplitThreadMBCategoryMessageReplyTest.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/splitthreadmbcategorythreadreply/ViewSplitThreadMBCategoryThreadReplyTest.html
@@ -1,12 +1,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>ViewSplitThreadMBCategoryMessageReplyTest</title>
+<title>ViewSplitThreadMBCategoryThreadReplyTest</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3">ViewSplitThreadMBCategoryMessageReplyTest</td></tr>
+<tr><td rowspan="1" colspan="3">ViewSplitThreadMBCategoryThreadReplyTest</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/splitthreadmbcategorymessagereply/ViewSplitThreadMBCategoryMessageReplyTest.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/splitthreadmbcategorythreadreply/ViewSplitThreadMBCategoryThreadReplyTest.java
similarity index 95%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/splitthreadmbcategorymessagereply/ViewSplitThreadMBCategoryMessageReplyTest.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/splitthreadmbcategorythreadreply/ViewSplitThreadMBCategoryThreadReplyTest.java
index 9146fc8eba08fc..44ceb40b364bcb 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/splitthreadmbcategorymessagereply/ViewSplitThreadMBCategoryMessageReplyTest.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/splitthreadmbcategorythreadreply/ViewSplitThreadMBCategoryThreadReplyTest.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.splitthreadmbcategorymessagereply;
+package com.liferay.portalweb.portlet.messageboards.mbthread.splitthreadmbcategorythreadreply;
 
 import com.liferay.portalweb.portal.BaseTestCase;
 import com.liferay.portalweb.portal.util.RuntimeVariables;
@@ -20,8 +20,8 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class ViewSplitThreadMBCategoryMessageReplyTest extends BaseTestCase {
-	public void testViewSplitThreadMBCategoryMessageReply()
+public class ViewSplitThreadMBCategoryThreadReplyTest extends BaseTestCase {
+	public void testViewSplitThreadMBCategoryThreadReply()
 		throws Exception {
 		selenium.open("/web/guest/home/");
 		loadRequiredJavaScriptModules();
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/splitthreadmbcategorymessagereplybackbutton/SplitThreadMBCategoryMessageReplyBackButtonTest.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/splitthreadmbcategorythreadreplybackbutton/SplitThreadMBCategoryThreadReplyBackButtonTest.html
similarity index 93%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/splitthreadmbcategorymessagereplybackbutton/SplitThreadMBCategoryMessageReplyBackButtonTest.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/splitthreadmbcategorythreadreplybackbutton/SplitThreadMBCategoryThreadReplyBackButtonTest.html
index 022147815455da..f6e2f938e899a8 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/splitthreadmbcategorymessagereplybackbutton/SplitThreadMBCategoryMessageReplyBackButtonTest.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/splitthreadmbcategorythreadreplybackbutton/SplitThreadMBCategoryThreadReplyBackButtonTest.html
@@ -1,12 +1,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>SplitThreadMBCategoryMessageReplyBackButtonTest</title>
+<title>SplitThreadMBCategoryThreadReplyBackButtonTest</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3">SplitThreadMBCategoryMessageReplyBackButtonTest</td></tr>
+<tr><td rowspan="1" colspan="3">SplitThreadMBCategoryThreadReplyBackButtonTest</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/splitthreadmbcategorymessagereplybackbutton/SplitThreadMBCategoryMessageReplyBackButtonTest.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/splitthreadmbcategorythreadreplybackbutton/SplitThreadMBCategoryThreadReplyBackButtonTest.java
similarity index 92%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/splitthreadmbcategorymessagereplybackbutton/SplitThreadMBCategoryMessageReplyBackButtonTest.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/splitthreadmbcategorythreadreplybackbutton/SplitThreadMBCategoryThreadReplyBackButtonTest.java
index e0ace3c17a3e94..d03ecb1f746161 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/splitthreadmbcategorymessagereplybackbutton/SplitThreadMBCategoryMessageReplyBackButtonTest.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/splitthreadmbcategorythreadreplybackbutton/SplitThreadMBCategoryThreadReplyBackButtonTest.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.splitthreadmbcategorymessagereplybackbutton;
+package com.liferay.portalweb.portlet.messageboards.mbthread.splitthreadmbcategorythreadreplybackbutton;
 
 import com.liferay.portalweb.portal.BaseTestCase;
 import com.liferay.portalweb.portal.util.RuntimeVariables;
@@ -20,9 +20,8 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class SplitThreadMBCategoryMessageReplyBackButtonTest
-	extends BaseTestCase {
-	public void testSplitThreadMBCategoryMessageReplyBackButton()
+public class SplitThreadMBCategoryThreadReplyBackButtonTest extends BaseTestCase {
+	public void testSplitThreadMBCategoryThreadReplyBackButton()
 		throws Exception {
 		selenium.open("/web/guest/home/");
 		loadRequiredJavaScriptModules();
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbcategorythreadmessagereply/ReplyMBCategoryThreadMessageReplyTests.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/splitthreadmbcategorythreadreplybackbutton/SplitThreadMBCategoryThreadReplyBackButtonTests.html
similarity index 74%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbcategorythreadmessagereply/ReplyMBCategoryThreadMessageReplyTests.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/splitthreadmbcategorythreadreplybackbutton/SplitThreadMBCategoryThreadReplyBackButtonTests.html
index 3952924aad3908..079a160f8f8325 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/replymbcategorythreadmessagereply/ReplyMBCategoryThreadMessageReplyTests.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/splitthreadmbcategorythreadreplybackbutton/SplitThreadMBCategoryThreadReplyBackButtonTests.html
@@ -11,11 +11,10 @@
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPageMBTest.html">AddPageMBTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPortletMBTest.html">AddPortletMBTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/AddMBCategoryTest.html">AddMBCategoryTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThreadMessageTest.html">PostNewMBCategoryThreadMessageTest</a></td></tr>
-<tr><td><a href="ReplyMBCategoryThreadMessageReplyTest.html">ReplyMBCategoryThreadMessageReplyTest</a></td></tr>
-<tr><td><a href="ViewMBCategoryThreadMessageReplyTest.html">ViewMBCategoryThreadMessageReplyTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategoryThreadTest.html">PostNewMBCategoryThreadTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/replymbcategorythreadreply/ReplyMBCategoryThreadReplyTest.html">ReplyMBCategoryThreadReplyTest</a></td></tr>
+<tr><td><a href="SplitThreadMBCategoryThreadReplyBackButtonTest.html">SplitThreadMBCategoryThreadReplyBackButtonTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/TearDownMBCategoryTest.html">TearDownMBCategoryTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/postnewmbthreadmessage/TearDownMBThreadTest.html">TearDownMBThreadTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portal/util/TearDownPageTest.html">TearDownPageTest</a></td></tr>
 </tbody></table>
 </body>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/markasanswermbcategorymessagequestionreply/MarkAsAnswerMBCategoryMessageQuestionReplyTests.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/splitthreadmbcategorythreadreplybackbutton/SplitThreadMBCategoryThreadReplyBackButtonTests.java
similarity index 71%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/markasanswermbcategorymessagequestionreply/MarkAsAnswerMBCategoryMessageQuestionReplyTests.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/splitthreadmbcategorythreadreplybackbutton/SplitThreadMBCategoryThreadReplyBackButtonTests.java
index 568ffc22208273..8cbf8c0d7bd031 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/markasanswermbcategorymessagequestionreply/MarkAsAnswerMBCategoryMessageQuestionReplyTests.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/splitthreadmbcategorythreadreplybackbutton/SplitThreadMBCategoryThreadReplyBackButtonTests.java
@@ -12,12 +12,14 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.markasanswermbcategorymessagequestionreply;
+package com.liferay.portalweb.portlet.messageboards.mbthread.splitthreadmbcategorythreadreplybackbutton;
 
 import com.liferay.portalweb.portal.BaseTestSuite;
 import com.liferay.portalweb.portal.util.TearDownPageTest;
 import com.liferay.portalweb.portlet.messageboards.mbcategory.addmbcategory.AddMBCategoryTest;
 import com.liferay.portalweb.portlet.messageboards.mbcategory.addmbcategory.TearDownMBCategoryTest;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbcategorythread.PostNewMBCategoryThreadTest;
+import com.liferay.portalweb.portlet.messageboards.mbthread.replymbcategorythreadreply.ReplyMBCategoryThreadReplyTest;
 import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPageMBTest;
 import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPortletMBTest;
 
@@ -27,16 +29,16 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class MarkAsAnswerMBCategoryMessageQuestionReplyTests
+public class SplitThreadMBCategoryThreadReplyBackButtonTests
 	extends BaseTestSuite {
 	public static Test suite() {
 		TestSuite testSuite = new TestSuite();
 		testSuite.addTestSuite(AddPageMBTest.class);
 		testSuite.addTestSuite(AddPortletMBTest.class);
 		testSuite.addTestSuite(AddMBCategoryTest.class);
-		testSuite.addTestSuite(AddMBCategoryMessageQuestionTest.class);
-		testSuite.addTestSuite(AddMBCategoryMessageQuestionReplyTest.class);
-		testSuite.addTestSuite(MarkAsAnswerMBCategoryMessageQuestionReplyTest.class);
+		testSuite.addTestSuite(PostNewMBCategoryThreadTest.class);
+		testSuite.addTestSuite(ReplyMBCategoryThreadReplyTest.class);
+		testSuite.addTestSuite(SplitThreadMBCategoryThreadReplyBackButtonTest.class);
 		testSuite.addTestSuite(TearDownMBCategoryTest.class);
 		testSuite.addTestSuite(TearDownPageTest.class);
 
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/splitthreadmbcategorymessagereplyexplanation/SplitThreadMBCategoryMessageReplyExplanationTest.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/splitthreadmbcategorythreadreplyexplanation/SplitThreadMBCategoryThreadReplyExplanationTest.html
similarity index 95%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/splitthreadmbcategorymessagereplyexplanation/SplitThreadMBCategoryMessageReplyExplanationTest.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/splitthreadmbcategorythreadreplyexplanation/SplitThreadMBCategoryThreadReplyExplanationTest.html
index 9afb67e698334b..3dc652ab0121a4 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/splitthreadmbcategorymessagereplyexplanation/SplitThreadMBCategoryMessageReplyExplanationTest.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/splitthreadmbcategorythreadreplyexplanation/SplitThreadMBCategoryThreadReplyExplanationTest.html
@@ -1,12 +1,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>SplitThreadMBCategoryMessageReplyExplanationTest</title>
+<title>SplitThreadMBCategoryThreadReplyExplanationTest</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3">SplitThreadMBCategoryMessageReplyExplanationTest</td></tr>
+<tr><td rowspan="1" colspan="3">SplitThreadMBCategoryThreadReplyExplanationTest</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/splitthreadmbcategorymessagereplyexplanation/SplitThreadMBCategoryMessageReplyExplanationTest.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/splitthreadmbcategorythreadreplyexplanation/SplitThreadMBCategoryThreadReplyExplanationTest.java
similarity index 95%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/splitthreadmbcategorymessagereplyexplanation/SplitThreadMBCategoryMessageReplyExplanationTest.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/splitthreadmbcategorythreadreplyexplanation/SplitThreadMBCategoryThreadReplyExplanationTest.java
index f8cfe1cc3f07dc..955807a8890b9d 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/splitthreadmbcategorymessagereplyexplanation/SplitThreadMBCategoryMessageReplyExplanationTest.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/splitthreadmbcategorythreadreplyexplanation/SplitThreadMBCategoryThreadReplyExplanationTest.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.splitthreadmbcategorymessagereplyexplanation;
+package com.liferay.portalweb.portlet.messageboards.mbthread.splitthreadmbcategorythreadreplyexplanation;
 
 import com.liferay.portalweb.portal.BaseTestCase;
 import com.liferay.portalweb.portal.util.RuntimeVariables;
@@ -20,9 +20,9 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class SplitThreadMBCategoryMessageReplyExplanationTest
+public class SplitThreadMBCategoryThreadReplyExplanationTest
 	extends BaseTestCase {
-	public void testSplitThreadMBCategoryMessageReplyExplanation()
+	public void testSplitThreadMBCategoryThreadReplyExplanation()
 		throws Exception {
 		selenium.open("/web/guest/home/");
 		loadRequiredJavaScriptModules();
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/splitthreadmbcategorymessagereplyexplanation/SplitThreadMBCategoryMessageReplyExplanationTests.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/splitthreadmbcategorythreadreplyexplanation/SplitThreadMBCategoryThreadReplyExplanationTests.html
similarity index 68%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/splitthreadmbcategorymessagereplyexplanation/SplitThreadMBCategoryMessageReplyExplanationTests.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/splitthreadmbcategorythreadreplyexplanation/SplitThreadMBCategoryThreadReplyExplanationTests.html
index 174b83a35bd773..7bf2b6f484d122 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/splitthreadmbcategorymessagereplyexplanation/SplitThreadMBCategoryMessageReplyExplanationTests.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/splitthreadmbcategorythreadreplyexplanation/SplitThreadMBCategoryThreadReplyExplanationTests.html
@@ -11,12 +11,12 @@
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPageMBTest.html">AddPageMBTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPortletMBTest.html">AddPortletMBTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/AddMBCategoryTest.html">AddMBCategoryTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThreadMessageTest.html">PostNewMBCategoryThreadMessageTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/replymbcategorythreadmessagereply/ReplyMBCategoryThreadMessageReplyTest.html">ReplyMBCategoryThreadMessageReplyTest</a></td></tr>
-<tr><td><a href="SplitThreadMBCategoryMessageReplyExplanationTest.html">SplitThreadMBCategoryMessageReplyExplanationTest</a></td></tr>
-<tr><td><a href="ViewSplitThreadMBCategoryMessageReplyExplanationTest.html">ViewSplitThreadMBCategoryMessageReplyExplanationTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategoryThreadTest.html">PostNewMBCategoryThreadTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/replymbcategorythreadreply/ReplyMBCategoryThreadReplyTest.html">ReplyMBCategoryThreadReplyTest</a></td></tr>
+<tr><td><a href="SplitThreadMBCategoryThreadReplyExplanationTest.html">SplitThreadMBCategoryThreadReplyExplanationTest</a></td></tr>
+<tr><td><a href="ViewSplitThreadMBCategoryThreadReplyExplanationTest.html">ViewSplitThreadMBCategoryThreadReplyExplanationTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/TearDownMBCategoryTest.html">TearDownMBCategoryTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/postnewmbthreadmessage/TearDownMBThreadTest.html">TearDownMBThreadTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/postnewmbthread/TearDownMBThreadTest.html">TearDownMBThreadTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portal/util/TearDownPageTest.html">TearDownPageTest</a></td></tr>
 </tbody></table>
 </body>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/splitthreadmbcategorymessagereply/SplitThreadMBCategoryMessageReplyTests.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/splitthreadmbcategorythreadreplyexplanation/SplitThreadMBCategoryThreadReplyExplanationTests.java
similarity index 65%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/splitthreadmbcategorymessagereply/SplitThreadMBCategoryMessageReplyTests.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/splitthreadmbcategorythreadreplyexplanation/SplitThreadMBCategoryThreadReplyExplanationTests.java
index fb55145a293fb6..2d95eb787d8b58 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/splitthreadmbcategorymessagereply/SplitThreadMBCategoryMessageReplyTests.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/splitthreadmbcategorythreadreplyexplanation/SplitThreadMBCategoryThreadReplyExplanationTests.java
@@ -12,15 +12,15 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.splitthreadmbcategorymessagereply;
+package com.liferay.portalweb.portlet.messageboards.mbthread.splitthreadmbcategorythreadreplyexplanation;
 
 import com.liferay.portalweb.portal.BaseTestSuite;
 import com.liferay.portalweb.portal.util.TearDownPageTest;
 import com.liferay.portalweb.portlet.messageboards.mbcategory.addmbcategory.AddMBCategoryTest;
 import com.liferay.portalweb.portlet.messageboards.mbcategory.addmbcategory.TearDownMBCategoryTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbcategorythreadmessage.PostNewMBCategoryThreadMessageTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbthreadmessage.TearDownMBThreadTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.replymbcategorythreadmessagereply.ReplyMBCategoryThreadMessageReplyTest;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbcategorythread.PostNewMBCategoryThreadTest;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbthread.TearDownMBThreadTest;
+import com.liferay.portalweb.portlet.messageboards.mbthread.replymbcategorythreadreply.ReplyMBCategoryThreadReplyTest;
 import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPageMBTest;
 import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPortletMBTest;
 
@@ -30,16 +30,17 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class SplitThreadMBCategoryMessageReplyTests extends BaseTestSuite {
+public class SplitThreadMBCategoryThreadReplyExplanationTests
+	extends BaseTestSuite {
 	public static Test suite() {
 		TestSuite testSuite = new TestSuite();
 		testSuite.addTestSuite(AddPageMBTest.class);
 		testSuite.addTestSuite(AddPortletMBTest.class);
 		testSuite.addTestSuite(AddMBCategoryTest.class);
-		testSuite.addTestSuite(PostNewMBCategoryThreadMessageTest.class);
-		testSuite.addTestSuite(ReplyMBCategoryThreadMessageReplyTest.class);
-		testSuite.addTestSuite(SplitThreadMBCategoryMessageReplyTest.class);
-		testSuite.addTestSuite(ViewSplitThreadMBCategoryMessageReplyTest.class);
+		testSuite.addTestSuite(PostNewMBCategoryThreadTest.class);
+		testSuite.addTestSuite(ReplyMBCategoryThreadReplyTest.class);
+		testSuite.addTestSuite(SplitThreadMBCategoryThreadReplyExplanationTest.class);
+		testSuite.addTestSuite(ViewSplitThreadMBCategoryThreadReplyExplanationTest.class);
 		testSuite.addTestSuite(TearDownMBCategoryTest.class);
 		testSuite.addTestSuite(TearDownMBThreadTest.class);
 		testSuite.addTestSuite(TearDownPageTest.class);
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/splitthreadmbcategorymessagereplyexplanation/ViewSplitThreadMBCategoryMessageReplyExplanationTest.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/splitthreadmbcategorythreadreplyexplanation/ViewSplitThreadMBCategoryThreadReplyExplanationTest.html
similarity index 96%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/splitthreadmbcategorymessagereplyexplanation/ViewSplitThreadMBCategoryMessageReplyExplanationTest.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/splitthreadmbcategorythreadreplyexplanation/ViewSplitThreadMBCategoryThreadReplyExplanationTest.html
index 75f7822bed7b94..e28372cf7ac939 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/splitthreadmbcategorymessagereplyexplanation/ViewSplitThreadMBCategoryMessageReplyExplanationTest.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/splitthreadmbcategorythreadreplyexplanation/ViewSplitThreadMBCategoryThreadReplyExplanationTest.html
@@ -1,12 +1,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>ViewSplitThreadMBCategoryMessageReplyExplanationTest</title>
+<title>ViewSplitThreadMBCategoryThreadReplyExplanationTest</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3">ViewSplitThreadMBCategoryMessageReplyExplanationTest</td></tr>
+<tr><td rowspan="1" colspan="3">ViewSplitThreadMBCategoryThreadReplyExplanationTest</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/splitthreadmbcategorymessagereplyexplanation/ViewSplitThreadMBCategoryMessageReplyExplanationTest.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/splitthreadmbcategorythreadreplyexplanation/ViewSplitThreadMBCategoryThreadReplyExplanationTest.java
similarity index 96%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/splitthreadmbcategorymessagereplyexplanation/ViewSplitThreadMBCategoryMessageReplyExplanationTest.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/splitthreadmbcategorythreadreplyexplanation/ViewSplitThreadMBCategoryThreadReplyExplanationTest.java
index 4909d9e572c2f6..7f61997ff26193 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/splitthreadmbcategorymessagereplyexplanation/ViewSplitThreadMBCategoryMessageReplyExplanationTest.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/splitthreadmbcategorythreadreplyexplanation/ViewSplitThreadMBCategoryThreadReplyExplanationTest.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.splitthreadmbcategorymessagereplyexplanation;
+package com.liferay.portalweb.portlet.messageboards.mbthread.splitthreadmbcategorythreadreplyexplanation;
 
 import com.liferay.portalweb.portal.BaseTestCase;
 import com.liferay.portalweb.portal.util.RuntimeVariables;
@@ -20,9 +20,9 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class ViewSplitThreadMBCategoryMessageReplyExplanationTest
+public class ViewSplitThreadMBCategoryThreadReplyExplanationTest
 	extends BaseTestCase {
-	public void testViewSplitThreadMBCategoryMessageReplyExplanation()
+	public void testViewSplitThreadMBCategoryThreadReplyExplanation()
 		throws Exception {
 		selenium.open("/web/guest/home/");
 		loadRequiredJavaScriptModules();
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/splitthreadmbcategorymessagereplyreply/SplitThreadMBCategoryMessageReplyReplyTest.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/splitthreadmbcategorythreadreplyreply/SplitThreadMBCategoryThreadReplyReplyTest.html
similarity index 95%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/splitthreadmbcategorymessagereplyreply/SplitThreadMBCategoryMessageReplyReplyTest.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/splitthreadmbcategorythreadreplyreply/SplitThreadMBCategoryThreadReplyReplyTest.html
index 98a3d9a824cc5d..e73e5830c6c9bb 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/splitthreadmbcategorymessagereplyreply/SplitThreadMBCategoryMessageReplyReplyTest.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/splitthreadmbcategorythreadreplyreply/SplitThreadMBCategoryThreadReplyReplyTest.html
@@ -1,12 +1,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>SplitThreadMBCategoryMessageReplyReplyTest</title>
+<title>SplitThreadMBCategoryThreadReplyReplyTest</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3">SplitThreadMBCategoryMessageReplyReplyTest</td></tr>
+<tr><td rowspan="1" colspan="3">SplitThreadMBCategoryThreadReplyReplyTest</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/splitthreadmbcategorymessagereplyreply/SplitThreadMBCategoryMessageReplyReplyTest.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/splitthreadmbcategorythreadreplyreply/SplitThreadMBCategoryThreadReplyReplyTest.java
similarity index 95%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/splitthreadmbcategorymessagereplyreply/SplitThreadMBCategoryMessageReplyReplyTest.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/splitthreadmbcategorythreadreplyreply/SplitThreadMBCategoryThreadReplyReplyTest.java
index b66aa3c67016f6..bb573616c847b2 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/splitthreadmbcategorymessagereplyreply/SplitThreadMBCategoryMessageReplyReplyTest.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/splitthreadmbcategorythreadreplyreply/SplitThreadMBCategoryThreadReplyReplyTest.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.splitthreadmbcategorymessagereplyreply;
+package com.liferay.portalweb.portlet.messageboards.mbthread.splitthreadmbcategorythreadreplyreply;
 
 import com.liferay.portalweb.portal.BaseTestCase;
 import com.liferay.portalweb.portal.util.RuntimeVariables;
@@ -20,8 +20,8 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class SplitThreadMBCategoryMessageReplyReplyTest extends BaseTestCase {
-	public void testSplitThreadMBCategoryMessageReplyReply()
+public class SplitThreadMBCategoryThreadReplyReplyTest extends BaseTestCase {
+	public void testSplitThreadMBCategoryThreadReplyReply()
 		throws Exception {
 		selenium.open("/web/guest/home/");
 		loadRequiredJavaScriptModules();
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadsmessage/PostNewMBCategoryThreadsMessageTests.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/splitthreadmbcategorythreadreplyreply/SplitThreadMBCategoryThreadReplyReplyTests.html
similarity index 64%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadsmessage/PostNewMBCategoryThreadsMessageTests.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/splitthreadmbcategorythreadreplyreply/SplitThreadMBCategoryThreadReplyReplyTests.html
index 5a586ec30501a9..deb7e0cfeca097 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadsmessage/PostNewMBCategoryThreadsMessageTests.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/splitthreadmbcategorythreadreplyreply/SplitThreadMBCategoryThreadReplyReplyTests.html
@@ -11,14 +11,13 @@
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPageMBTest.html">AddPageMBTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPortletMBTest.html">AddPortletMBTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/AddMBCategoryTest.html">AddMBCategoryTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThread1MessageTest.html">PostNewMBCategoryThread1MessageTest</a></td></tr>
-<tr><td><a href="ViewMBCategoryThread1MessageTest.html">ViewMBCategoryThread1MessageTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThread2MessageTest.html">PostNewMBCategoryThread2MessageTest</a></td></tr>
-<tr><td><a href="ViewMBCategoryThread2MessageTest.html">ViewMBCategoryThread2MessageTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThread3MessageTest.html">PostNewMBCategoryThread3MessageTest</a></td></tr>
-<tr><td><a href="ViewMBCategoryThread3MessageTest.html">ViewMBCategoryThread3MessageTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategoryThreadTest.html">PostNewMBCategoryThreadTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/replymbcategorythreadreply/ReplyMBCategoryThreadReplyTest.html">ReplyMBCategoryThreadReplyTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/replymbcategorythreadreplyreply/ReplyMBCategoryThreadReplyReplyTest.html">ReplyMBCategoryThreadReplyReplyTest</a></td></tr>
+<tr><td><a href="SplitThreadMBCategoryThreadReplyReplyTest.html">SplitThreadMBCategoryThreadReplyReplyTest</a></td></tr>
+<tr><td><a href="ViewSplitThreadMBCategoryThreadReplyReplyTest.html">ViewSplitThreadMBCategoryThreadReplyReplyTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/TearDownMBCategoryTest.html">TearDownMBCategoryTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/postnewmbthreadmessage/TearDownMBThreadTest.html">TearDownMBThreadTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/postnewmbthread/TearDownMBThreadTest.html">TearDownMBThreadTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portal/util/TearDownPageTest.html">TearDownPageTest</a></td></tr>
 </tbody></table>
 </body>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/splitthreadmbcategorythreadreplyreply/SplitThreadMBCategoryThreadReplyReplyTests.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/splitthreadmbcategorythreadreplyreply/SplitThreadMBCategoryThreadReplyReplyTests.java
new file mode 100644
index 00000000000000..87c005498fb896
--- /dev/null
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/splitthreadmbcategorythreadreplyreply/SplitThreadMBCategoryThreadReplyReplyTests.java
@@ -0,0 +1,51 @@
+/**
+ * Copyright (c) 2000-2012 Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package com.liferay.portalweb.portlet.messageboards.mbthread.splitthreadmbcategorythreadreplyreply;
+
+import com.liferay.portalweb.portal.BaseTestSuite;
+import com.liferay.portalweb.portal.util.TearDownPageTest;
+import com.liferay.portalweb.portlet.messageboards.mbcategory.addmbcategory.AddMBCategoryTest;
+import com.liferay.portalweb.portlet.messageboards.mbcategory.addmbcategory.TearDownMBCategoryTest;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbcategorythread.PostNewMBCategoryThreadTest;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbthread.TearDownMBThreadTest;
+import com.liferay.portalweb.portlet.messageboards.mbthread.replymbcategorythreadreply.ReplyMBCategoryThreadReplyTest;
+import com.liferay.portalweb.portlet.messageboards.mbthread.replymbcategorythreadreplyreply.ReplyMBCategoryThreadReplyReplyTest;
+import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPageMBTest;
+import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPortletMBTest;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+/**
+ * @author Brian Wing Shun Chan
+ */
+public class SplitThreadMBCategoryThreadReplyReplyTests extends BaseTestSuite {
+	public static Test suite() {
+		TestSuite testSuite = new TestSuite();
+		testSuite.addTestSuite(AddPageMBTest.class);
+		testSuite.addTestSuite(AddPortletMBTest.class);
+		testSuite.addTestSuite(AddMBCategoryTest.class);
+		testSuite.addTestSuite(PostNewMBCategoryThreadTest.class);
+		testSuite.addTestSuite(ReplyMBCategoryThreadReplyTest.class);
+		testSuite.addTestSuite(ReplyMBCategoryThreadReplyReplyTest.class);
+		testSuite.addTestSuite(SplitThreadMBCategoryThreadReplyReplyTest.class);
+		testSuite.addTestSuite(ViewSplitThreadMBCategoryThreadReplyReplyTest.class);
+		testSuite.addTestSuite(TearDownMBCategoryTest.class);
+		testSuite.addTestSuite(TearDownMBThreadTest.class);
+		testSuite.addTestSuite(TearDownPageTest.class);
+
+		return testSuite;
+	}
+}
\ No newline at end of file
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/splitthreadmbcategorymessagereplyreply/ViewSplitThreadMBCategoryMessageReplyReplyTest.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/splitthreadmbcategorythreadreplyreply/ViewSplitThreadMBCategoryThreadReplyReplyTest.html
similarity index 96%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/splitthreadmbcategorymessagereplyreply/ViewSplitThreadMBCategoryMessageReplyReplyTest.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/splitthreadmbcategorythreadreplyreply/ViewSplitThreadMBCategoryThreadReplyReplyTest.html
index 9d1e4c3c29e4bc..986d7d6f39e69f 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/splitthreadmbcategorymessagereplyreply/ViewSplitThreadMBCategoryMessageReplyReplyTest.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/splitthreadmbcategorythreadreplyreply/ViewSplitThreadMBCategoryThreadReplyReplyTest.html
@@ -1,12 +1,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>ViewSplitThreadMBCategoryMessageReplyReplyTest</title>
+<title>ViewSplitThreadMBCategoryThreadReplyReplyTest</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3">ViewSplitThreadMBCategoryMessageReplyReplyTest</td></tr>
+<tr><td rowspan="1" colspan="3">ViewSplitThreadMBCategoryThreadReplyReplyTest</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/splitthreadmbcategorymessagereplyreply/ViewSplitThreadMBCategoryMessageReplyReplyTest.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/splitthreadmbcategorythreadreplyreply/ViewSplitThreadMBCategoryThreadReplyReplyTest.java
similarity index 96%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/splitthreadmbcategorymessagereplyreply/ViewSplitThreadMBCategoryMessageReplyReplyTest.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/splitthreadmbcategorythreadreplyreply/ViewSplitThreadMBCategoryThreadReplyReplyTest.java
index 2467e8b9919d64..df97d3db45fe00 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/splitthreadmbcategorymessagereplyreply/ViewSplitThreadMBCategoryMessageReplyReplyTest.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/splitthreadmbcategorythreadreplyreply/ViewSplitThreadMBCategoryThreadReplyReplyTest.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.splitthreadmbcategorymessagereplyreply;
+package com.liferay.portalweb.portlet.messageboards.mbthread.splitthreadmbcategorythreadreplyreply;
 
 import com.liferay.portalweb.portal.BaseTestCase;
 import com.liferay.portalweb.portal.util.RuntimeVariables;
@@ -20,8 +20,8 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class ViewSplitThreadMBCategoryMessageReplyReplyTest extends BaseTestCase {
-	public void testViewSplitThreadMBCategoryMessageReplyReply()
+public class ViewSplitThreadMBCategoryThreadReplyReplyTest extends BaseTestCase {
+	public void testViewSplitThreadMBCategoryThreadReplyReply()
 		throws Exception {
 		selenium.open("/web/guest/home/");
 		loadRequiredJavaScriptModules();
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/unmarkmbcategorymessagequestionreply/UnmarkMBCategoryMessageQuestionReplyTest.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/unmarkmbcategorythreadquestionreply/UnmarkMBCategoryThreadQuestionReplyTest.html
similarity index 93%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/unmarkmbcategorymessagequestionreply/UnmarkMBCategoryMessageQuestionReplyTest.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/unmarkmbcategorythreadquestionreply/UnmarkMBCategoryThreadQuestionReplyTest.html
index 308b15806227c1..0fce1a64826a94 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/unmarkmbcategorymessagequestionreply/UnmarkMBCategoryMessageQuestionReplyTest.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/unmarkmbcategorythreadquestionreply/UnmarkMBCategoryThreadQuestionReplyTest.html
@@ -1,12 +1,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>UnmarkMBCategoryMessageQuestionReplyTest</title>
+<title>UnmarkMBCategoryThreadQuestionReplyTest</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3">UnmarkMBCategoryMessageQuestionReplyTest</td></tr>
+<tr><td rowspan="1" colspan="3">UnmarkMBCategoryThreadQuestionReplyTest</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
@@ -113,7 +113,6 @@
 	<td>//td[2]/a</td>
 	<td>Resolved</td>
 </tr>
-
 </tbody></table>
 </body>
 </html>
\ No newline at end of file
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/unmarkmbcategorymessagequestionreply/UnmarkMBCategoryMessageQuestionReplyTest.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/unmarkmbcategorythreadquestionreply/UnmarkMBCategoryThreadQuestionReplyTest.java
similarity index 94%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/unmarkmbcategorymessagequestionreply/UnmarkMBCategoryMessageQuestionReplyTest.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/unmarkmbcategorythreadquestionreply/UnmarkMBCategoryThreadQuestionReplyTest.java
index 161c43c5b6b487..c7a31d8e22a97a 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/unmarkmbcategorymessagequestionreply/UnmarkMBCategoryMessageQuestionReplyTest.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/unmarkmbcategorythreadquestionreply/UnmarkMBCategoryThreadQuestionReplyTest.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.unmarkmbcategorymessagequestionreply;
+package com.liferay.portalweb.portlet.messageboards.mbthread.unmarkmbcategorythreadquestionreply;
 
 import com.liferay.portalweb.portal.BaseTestCase;
 import com.liferay.portalweb.portal.util.RuntimeVariables;
@@ -20,8 +20,8 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class UnmarkMBCategoryMessageQuestionReplyTest extends BaseTestCase {
-	public void testUnmarkMBCategoryMessageQuestionReply()
+public class UnmarkMBCategoryThreadQuestionReplyTest extends BaseTestCase {
+	public void testUnmarkMBCategoryThreadQuestionReply()
 		throws Exception {
 		selenium.open("/web/guest/home/");
 		loadRequiredJavaScriptModules();
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/previousmbcategorymessage/PreviousMBCategoryMessageTests.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/unmarkmbcategorythreadquestionreply/UnmarkMBCategoryThreadQuestionReplyTests.html
similarity index 68%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/previousmbcategorymessage/PreviousMBCategoryMessageTests.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/unmarkmbcategorythreadquestionreply/UnmarkMBCategoryThreadQuestionReplyTests.html
index 0275c1f6a22cb5..9673329a6119be 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/previousmbcategorymessage/PreviousMBCategoryMessageTests.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/unmarkmbcategorythreadquestionreply/UnmarkMBCategoryThreadQuestionReplyTests.html
@@ -3,18 +3,18 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
   <meta content="text/html; charset=UTF-8" http-equiv="content-type" />
-  <title>PreviousMBCategoryMessageTests</title>
+  <title>Test Suite</title>
 </head>
 <body>
 <table id="suiteTable" cellpadding="1" cellspacing="1" border="1" class="selenium"><tbody>
-<tr><td><b>PreviousMBCategoryMessageTests</b></td></tr>
+<tr><td><b>Test Suite</b></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPageMBTest.html">AddPageMBTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPortletMBTest.html">AddPortletMBTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/AddMBCategoryTest.html">AddMBCategoryTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThread1MessageTest.html">PostNewMBCategoryThread1MessageTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThread2MessageTest.html">PostNewMBCategoryThread2MessageTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/postnewmbcategorythreadmessage/PostNewMBCategoryThread3MessageTest.html">PostNewMBCategoryThread3MessageTest</a></td></tr>
-<tr><td><a href="PreviousMBCategoryMessageTest.html">PreviousMBCategoryMessageTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/postnewmbcategorythreadquestion/PostNewMBCategoryThreadQuestionTest.html">PostNewMBCategoryThreadQuestionTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/replymbcategorythreadquestionreply/ReplyMBCategoryThreadQuestionReplyTest.html">ReplyMBCategoryThreadQuestionReplyTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/markasanswermbcategorythreadquestionreply/MarkAsAnswerMBCategoryThreadQuestionReplyTest.html">MarkAsAnswerMBCategoryThreadQuestionReplyTest</a></td></tr>
+<tr><td><a href="UnmarkMBCategoryThreadQuestionReplyTest.html">UnmarkMBCategoryThreadQuestionReplyTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/TearDownMBCategoryTest.html">TearDownMBCategoryTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portal/util/TearDownPageTest.html">TearDownPageTest</a></td></tr>
 </tbody></table>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/nextmbcategorymessage/NextMBCategoryMessageTests.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/unmarkmbcategorythreadquestionreply/UnmarkMBCategoryThreadQuestionReplyTests.java
similarity index 63%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/nextmbcategorymessage/NextMBCategoryMessageTests.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/unmarkmbcategorythreadquestionreply/UnmarkMBCategoryThreadQuestionReplyTests.java
index 7b0e94cd4229a8..e3a833fae45157 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/nextmbcategorymessage/NextMBCategoryMessageTests.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/unmarkmbcategorythreadquestionreply/UnmarkMBCategoryThreadQuestionReplyTests.java
@@ -12,15 +12,15 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.nextmbcategorymessage;
+package com.liferay.portalweb.portlet.messageboards.mbthread.unmarkmbcategorythreadquestionreply;
 
 import com.liferay.portalweb.portal.BaseTestSuite;
 import com.liferay.portalweb.portal.util.TearDownPageTest;
 import com.liferay.portalweb.portlet.messageboards.mbcategory.addmbcategory.AddMBCategoryTest;
 import com.liferay.portalweb.portlet.messageboards.mbcategory.addmbcategory.TearDownMBCategoryTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbcategorythreadmessage.PostNewMBCategoryThread1MessageTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbcategorythreadmessage.PostNewMBCategoryThread2MessageTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbcategorythreadmessage.PostNewMBCategoryThread3MessageTest;
+import com.liferay.portalweb.portlet.messageboards.mbthread.markasanswermbcategorythreadquestionreply.MarkAsAnswerMBCategoryThreadQuestionReplyTest;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbcategorythreadquestion.PostNewMBCategoryThreadQuestionTest;
+import com.liferay.portalweb.portlet.messageboards.mbthread.replymbcategorythreadquestionreply.ReplyMBCategoryThreadQuestionReplyTest;
 import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPageMBTest;
 import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPortletMBTest;
 
@@ -30,16 +30,16 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class NextMBCategoryMessageTests extends BaseTestSuite {
+public class UnmarkMBCategoryThreadQuestionReplyTests extends BaseTestSuite {
 	public static Test suite() {
 		TestSuite testSuite = new TestSuite();
 		testSuite.addTestSuite(AddPageMBTest.class);
 		testSuite.addTestSuite(AddPortletMBTest.class);
 		testSuite.addTestSuite(AddMBCategoryTest.class);
-		testSuite.addTestSuite(PostNewMBCategoryThread1MessageTest.class);
-		testSuite.addTestSuite(PostNewMBCategoryThread2MessageTest.class);
-		testSuite.addTestSuite(PostNewMBCategoryThread3MessageTest.class);
-		testSuite.addTestSuite(NextMBCategoryMessageTest.class);
+		testSuite.addTestSuite(PostNewMBCategoryThreadQuestionTest.class);
+		testSuite.addTestSuite(ReplyMBCategoryThreadQuestionReplyTest.class);
+		testSuite.addTestSuite(MarkAsAnswerMBCategoryThreadQuestionReplyTest.class);
+		testSuite.addTestSuite(UnmarkMBCategoryThreadQuestionReplyTest.class);
 		testSuite.addTestSuite(TearDownMBCategoryTest.class);
 		testSuite.addTestSuite(TearDownPageTest.class);
 
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/viewmbcategorymessagemyposts/ViewMBCategoryMessageMyPostsTest.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/viewmbcategorythreadmyposts/ViewMBCategoryThreadMyPostsTest.html
similarity index 87%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/viewmbcategorymessagemyposts/ViewMBCategoryMessageMyPostsTest.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/viewmbcategorythreadmyposts/ViewMBCategoryThreadMyPostsTest.html
index e1cf34b1b7c7de..1ee15d83c0fea2 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/viewmbcategorymessagemyposts/ViewMBCategoryMessageMyPostsTest.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/viewmbcategorythreadmyposts/ViewMBCategoryThreadMyPostsTest.html
@@ -1,12 +1,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>ViewMBCategoryMessageMyPostsTest</title>
+<title>ViewMBCategoryThreadMyPostsTest</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3">ViewMBCategoryMessageMyPostsTest</td></tr>
+<tr><td rowspan="1" colspan="3">ViewMBCategoryThreadMyPostsTest</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/viewmbcategorymessagemyposts/ViewMBCategoryMessageMyPostsTest.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/viewmbcategorythreadmyposts/ViewMBCategoryThreadMyPostsTest.java
similarity index 88%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/viewmbcategorymessagemyposts/ViewMBCategoryMessageMyPostsTest.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/viewmbcategorythreadmyposts/ViewMBCategoryThreadMyPostsTest.java
index f899f0ae2e1aec..87ba14cde97d35 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/viewmbcategorymessagemyposts/ViewMBCategoryMessageMyPostsTest.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/viewmbcategorythreadmyposts/ViewMBCategoryThreadMyPostsTest.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.viewmbcategorymessagemyposts;
+package com.liferay.portalweb.portlet.messageboards.mbthread.viewmbcategorythreadmyposts;
 
 import com.liferay.portalweb.portal.BaseTestCase;
 import com.liferay.portalweb.portal.util.RuntimeVariables;
@@ -20,8 +20,8 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class ViewMBCategoryMessageMyPostsTest extends BaseTestCase {
-	public void testViewMBCategoryMessageMyPosts() throws Exception {
+public class ViewMBCategoryThreadMyPostsTest extends BaseTestCase {
+	public void testViewMBCategoryThreadMyPosts() throws Exception {
 		selenium.open("/web/guest/home/");
 		loadRequiredJavaScriptModules();
 
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/viewmbcategorythreadmyposts/ViewMBCategoryThreadMyPostsTests.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/viewmbcategorythreadmyposts/ViewMBCategoryThreadMyPostsTests.html
new file mode 100644
index 00000000000000..cc8c25d6c9ce81
--- /dev/null
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/viewmbcategorythreadmyposts/ViewMBCategoryThreadMyPostsTests.html
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+  <meta content="text/html; charset=UTF-8" http-equiv="content-type" />
+  <title>ViewMBCategoryThreadMyPostsTests</title>
+</head>
+<body>
+<table id="suiteTable" cellpadding="1" cellspacing="1" border="1" class="selenium"><tbody>
+<tr><td><b>ViewMBCategoryThreadMyPostsTests</b></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPageMBTest.html">AddPageMBTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPortletMBTest.html">AddPortletMBTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/AddMBCategoryTest.html">AddMBCategoryTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategoryThreadTest.html">PostNewMBCategoryThreadTest</a></td></tr>
+<tr><td><a href="ViewMBCategoryThreadMyPostsTest.html">ViewMBCategoryThreadMyPostsTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/TearDownMBCategoryTest.html">TearDownMBCategoryTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portal/util/TearDownPageTest.html">TearDownPageTest</a></td></tr>
+</tbody></table>
+</body>
+</html>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/viewmbcategorythreadmyposts/ViewMBCategoryThreadMyPostsTests.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/viewmbcategorythreadmyposts/ViewMBCategoryThreadMyPostsTests.java
new file mode 100644
index 00000000000000..07b33b713f6795
--- /dev/null
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/viewmbcategorythreadmyposts/ViewMBCategoryThreadMyPostsTests.java
@@ -0,0 +1,44 @@
+/**
+ * Copyright (c) 2000-2012 Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package com.liferay.portalweb.portlet.messageboards.mbthread.viewmbcategorythreadmyposts;
+
+import com.liferay.portalweb.portal.BaseTestSuite;
+import com.liferay.portalweb.portal.util.TearDownPageTest;
+import com.liferay.portalweb.portlet.messageboards.mbcategory.addmbcategory.AddMBCategoryTest;
+import com.liferay.portalweb.portlet.messageboards.mbcategory.addmbcategory.TearDownMBCategoryTest;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbcategorythread.PostNewMBCategoryThreadTest;
+import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPageMBTest;
+import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPortletMBTest;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+/**
+ * @author Brian Wing Shun Chan
+ */
+public class ViewMBCategoryThreadMyPostsTests extends BaseTestSuite {
+	public static Test suite() {
+		TestSuite testSuite = new TestSuite();
+		testSuite.addTestSuite(AddPageMBTest.class);
+		testSuite.addTestSuite(AddPortletMBTest.class);
+		testSuite.addTestSuite(AddMBCategoryTest.class);
+		testSuite.addTestSuite(PostNewMBCategoryThreadTest.class);
+		testSuite.addTestSuite(ViewMBCategoryThreadMyPostsTest.class);
+		testSuite.addTestSuite(TearDownMBCategoryTest.class);
+		testSuite.addTestSuite(TearDownPageTest.class);
+
+		return testSuite;
+	}
+}
\ No newline at end of file
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/viewmbcategorymessagepostcount/AddMBCategoryMessage1Reply1Test.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/viewmbcategorythreadpostcount/ReplyMBCategoryThread1Reply1Test.html
similarity index 95%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/viewmbcategorymessagepostcount/AddMBCategoryMessage1Reply1Test.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/viewmbcategorythreadpostcount/ReplyMBCategoryThread1Reply1Test.html
index de051878ee7d17..92c25fee51376b 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/viewmbcategorymessagepostcount/AddMBCategoryMessage1Reply1Test.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/viewmbcategorythreadpostcount/ReplyMBCategoryThread1Reply1Test.html
@@ -1,12 +1,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>AddMBCategoryMessage1Reply1Test</title>
+<title>ReplyMBCategoryThread1Reply1Test</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3">AddMBCategoryMessage1Reply1Test</td></tr>
+<tr><td rowspan="1" colspan="3">ReplyMBCategoryThread1Reply1Test</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/viewmbcategorymessagepostcount/AddMBCategoryMessage1Reply1Test.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/viewmbcategorythreadpostcount/ReplyMBCategoryThread1Reply1Test.java
similarity index 95%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/viewmbcategorymessagepostcount/AddMBCategoryMessage1Reply1Test.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/viewmbcategorythreadpostcount/ReplyMBCategoryThread1Reply1Test.java
index 7471300b9240f5..93cd17e9346489 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/viewmbcategorymessagepostcount/AddMBCategoryMessage1Reply1Test.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/viewmbcategorythreadpostcount/ReplyMBCategoryThread1Reply1Test.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.viewmbcategorymessagepostcount;
+package com.liferay.portalweb.portlet.messageboards.mbthread.viewmbcategorythreadpostcount;
 
 import com.liferay.portalweb.portal.BaseTestCase;
 import com.liferay.portalweb.portal.util.RuntimeVariables;
@@ -20,8 +20,8 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class AddMBCategoryMessage1Reply1Test extends BaseTestCase {
-	public void testAddMBCategoryMessage1Reply1() throws Exception {
+public class ReplyMBCategoryThread1Reply1Test extends BaseTestCase {
+	public void testReplyMBCategoryThread1Reply1() throws Exception {
 		selenium.open("/web/guest/home/");
 		loadRequiredJavaScriptModules();
 
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/viewmbcategorymessagepostcount/AddMBCategoryMessage1Reply2Test.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/viewmbcategorythreadpostcount/ReplyMBCategoryThread1Reply2Test.html
similarity index 96%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/viewmbcategorymessagepostcount/AddMBCategoryMessage1Reply2Test.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/viewmbcategorythreadpostcount/ReplyMBCategoryThread1Reply2Test.html
index 690de83c426ea5..f881d2743415d2 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/viewmbcategorymessagepostcount/AddMBCategoryMessage1Reply2Test.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/viewmbcategorythreadpostcount/ReplyMBCategoryThread1Reply2Test.html
@@ -1,12 +1,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>AddMBCategoryMessage1Reply2Test</title>
+<title>ReplyMBCategoryThread1Reply2Test</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3">AddMBCategoryMessage1Reply2Test</td></tr>
+<tr><td rowspan="1" colspan="3">ReplyMBCategoryThread1Reply2Test</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/viewmbcategorymessagepostcount/AddMBCategoryMessage1Reply2Test.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/viewmbcategorythreadpostcount/ReplyMBCategoryThread1Reply2Test.java
similarity index 96%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/viewmbcategorymessagepostcount/AddMBCategoryMessage1Reply2Test.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/viewmbcategorythreadpostcount/ReplyMBCategoryThread1Reply2Test.java
index 4a4d8c2d25b637..d2ac3b148075e5 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/viewmbcategorymessagepostcount/AddMBCategoryMessage1Reply2Test.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/viewmbcategorythreadpostcount/ReplyMBCategoryThread1Reply2Test.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.viewmbcategorymessagepostcount;
+package com.liferay.portalweb.portlet.messageboards.mbthread.viewmbcategorythreadpostcount;
 
 import com.liferay.portalweb.portal.BaseTestCase;
 import com.liferay.portalweb.portal.util.RuntimeVariables;
@@ -20,8 +20,8 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class AddMBCategoryMessage1Reply2Test extends BaseTestCase {
-	public void testAddMBCategoryMessage1Reply2() throws Exception {
+public class ReplyMBCategoryThread1Reply2Test extends BaseTestCase {
+	public void testReplyMBCategoryThread1Reply2() throws Exception {
 		selenium.open("/web/guest/home/");
 		loadRequiredJavaScriptModules();
 
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/viewmbcategorymessagepostcount/AddMBCategoryMessage1Reply3Test.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/viewmbcategorythreadpostcount/ReplyMBCategoryThread1Reply3Test.html
similarity index 96%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/viewmbcategorymessagepostcount/AddMBCategoryMessage1Reply3Test.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/viewmbcategorythreadpostcount/ReplyMBCategoryThread1Reply3Test.html
index 4870f05462ea50..6c0eed90ce4f97 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/viewmbcategorymessagepostcount/AddMBCategoryMessage1Reply3Test.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/viewmbcategorythreadpostcount/ReplyMBCategoryThread1Reply3Test.html
@@ -1,12 +1,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>AddMBCategoryMessage1Reply3Test</title>
+<title>ReplyMBCategoryThread1Reply3Test</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3">AddMBCategoryMessage1Reply3Test</td></tr>
+<tr><td rowspan="1" colspan="3">ReplyMBCategoryThread1Reply3Test</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/viewmbcategorymessagepostcount/AddMBCategoryMessage1Reply3Test.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/viewmbcategorythreadpostcount/ReplyMBCategoryThread1Reply3Test.java
similarity index 96%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/viewmbcategorymessagepostcount/AddMBCategoryMessage1Reply3Test.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/viewmbcategorythreadpostcount/ReplyMBCategoryThread1Reply3Test.java
index f1d3fbc3dacd79..f84df8800f76de 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/viewmbcategorymessagepostcount/AddMBCategoryMessage1Reply3Test.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/viewmbcategorythreadpostcount/ReplyMBCategoryThread1Reply3Test.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.viewmbcategorymessagepostcount;
+package com.liferay.portalweb.portlet.messageboards.mbthread.viewmbcategorythreadpostcount;
 
 import com.liferay.portalweb.portal.BaseTestCase;
 import com.liferay.portalweb.portal.util.RuntimeVariables;
@@ -20,8 +20,8 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class AddMBCategoryMessage1Reply3Test extends BaseTestCase {
-	public void testAddMBCategoryMessage1Reply3() throws Exception {
+public class ReplyMBCategoryThread1Reply3Test extends BaseTestCase {
+	public void testReplyMBCategoryThread1Reply3() throws Exception {
 		selenium.open("/web/guest/home/");
 		loadRequiredJavaScriptModules();
 
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/viewmbcategorymessagepostcount/ViewMBCategoryMessagePostCountTest.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/viewmbcategorythreadpostcount/ViewMBCategoryThreadPostCountTest.html
similarity index 97%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/viewmbcategorymessagepostcount/ViewMBCategoryMessagePostCountTest.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/viewmbcategorythreadpostcount/ViewMBCategoryThreadPostCountTest.html
index 64624b0b3f6314..3d5e4adc2e1248 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/viewmbcategorymessagepostcount/ViewMBCategoryMessagePostCountTest.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/viewmbcategorythreadpostcount/ViewMBCategoryThreadPostCountTest.html
@@ -1,12 +1,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>ViewMBCategoryMessagePostCountTest</title>
+<title>ViewMBCategoryThreadPostCountTest</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3">ViewMBCategoryMessagePostCountTest</td></tr>
+<tr><td rowspan="1" colspan="3">ViewMBCategoryThreadPostCountTest</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/viewmbcategorymessagepostcount/ViewMBCategoryMessagePostCountTest.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/viewmbcategorythreadpostcount/ViewMBCategoryThreadPostCountTest.java
similarity index 97%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/viewmbcategorymessagepostcount/ViewMBCategoryMessagePostCountTest.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/viewmbcategorythreadpostcount/ViewMBCategoryThreadPostCountTest.java
index 273c13ad19a3bd..431a6819bd5c06 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/viewmbcategorymessagepostcount/ViewMBCategoryMessagePostCountTest.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/viewmbcategorythreadpostcount/ViewMBCategoryThreadPostCountTest.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.viewmbcategorymessagepostcount;
+package com.liferay.portalweb.portlet.messageboards.mbthread.viewmbcategorythreadpostcount;
 
 import com.liferay.portalweb.portal.BaseTestCase;
 import com.liferay.portalweb.portal.util.RuntimeVariables;
@@ -20,8 +20,8 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class ViewMBCategoryMessagePostCountTest extends BaseTestCase {
-	public void testViewMBCategoryMessagePostCount() throws Exception {
+public class ViewMBCategoryThreadPostCountTest extends BaseTestCase {
+	public void testViewMBCategoryThreadPostCount() throws Exception {
 		selenium.open("/web/guest/home/");
 		loadRequiredJavaScriptModules();
 
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/viewmbcategorythreadpostcount/ViewMBCategoryThreadPostCountTests.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/viewmbcategorythreadpostcount/ViewMBCategoryThreadPostCountTests.html
new file mode 100644
index 00000000000000..26a43f4b172d57
--- /dev/null
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/viewmbcategorythreadpostcount/ViewMBCategoryThreadPostCountTests.html
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+  <meta content="text/html; charset=UTF-8" http-equiv="content-type" />
+  <title>ViewMBCategoryThreadPostCountTests</title>
+</head>
+<body>
+<table id="suiteTable" cellpadding="1" cellspacing="1" border="1" class="selenium"><tbody>
+<tr><td><b>ViewMBCategoryThreadPostCountTests</b></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPageMBTest.html">AddPageMBTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPortletMBTest.html">AddPortletMBTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/AddMBCategoryTest.html">AddMBCategoryTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategoryThread1Test.html">PostNewMBCategoryThread1Test</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategoryThread2Test.html">PostNewMBCategoryThread2Test</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategoryThread3Test.html">PostNewMBCategoryThread3Test</a></td></tr>
+<tr><td><a href="ReplyMBCategoryThread1Reply1Test.html">ReplyMBCategoryThread1Reply1Test</a></td></tr>
+<tr><td><a href="ReplyMBCategoryThread1Reply2Test.html">ReplyMBCategoryThread1Reply2Test</a></td></tr>
+<tr><td><a href="ReplyMBCategoryThread1Reply3Test.html">ReplyMBCategoryThread1Reply3Test</a></td></tr>
+<tr><td><a href="ViewMBCategoryThreadPostCountTest.html">ViewMBCategoryThreadPostCountTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/TearDownMBCategoryTest.html">TearDownMBCategoryTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portal/util/TearDownPageTest.html">TearDownPageTest</a></td></tr>
+</tbody></table>
+</body>
+</html>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/editmbcategorymessagebodynull/EditMBCategoryMessageBodyNullTests.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/viewmbcategorythreadpostcount/ViewMBCategoryThreadPostCountTests.java
similarity index 61%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/editmbcategorymessagebodynull/EditMBCategoryMessageBodyNullTests.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/viewmbcategorythreadpostcount/ViewMBCategoryThreadPostCountTests.java
index 70e5139d49390b..e16d4046dfa0f1 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/editmbcategorymessagebodynull/EditMBCategoryMessageBodyNullTests.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/viewmbcategorythreadpostcount/ViewMBCategoryThreadPostCountTests.java
@@ -12,13 +12,15 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.editmbcategorymessagebodynull;
+package com.liferay.portalweb.portlet.messageboards.mbthread.viewmbcategorythreadpostcount;
 
 import com.liferay.portalweb.portal.BaseTestSuite;
 import com.liferay.portalweb.portal.util.TearDownPageTest;
 import com.liferay.portalweb.portlet.messageboards.mbcategory.addmbcategory.AddMBCategoryTest;
 import com.liferay.portalweb.portlet.messageboards.mbcategory.addmbcategory.TearDownMBCategoryTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbcategorythreadmessage.PostNewMBCategoryThreadMessageTest;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbcategorythread.PostNewMBCategoryThread1Test;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbcategorythread.PostNewMBCategoryThread2Test;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbcategorythread.PostNewMBCategoryThread3Test;
 import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPageMBTest;
 import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPortletMBTest;
 
@@ -28,14 +30,19 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class EditMBCategoryMessageBodyNullTests extends BaseTestSuite {
+public class ViewMBCategoryThreadPostCountTests extends BaseTestSuite {
 	public static Test suite() {
 		TestSuite testSuite = new TestSuite();
 		testSuite.addTestSuite(AddPageMBTest.class);
 		testSuite.addTestSuite(AddPortletMBTest.class);
 		testSuite.addTestSuite(AddMBCategoryTest.class);
-		testSuite.addTestSuite(PostNewMBCategoryThreadMessageTest.class);
-		testSuite.addTestSuite(EditMBCategoryMessageBodyNullTest.class);
+		testSuite.addTestSuite(PostNewMBCategoryThread1Test.class);
+		testSuite.addTestSuite(PostNewMBCategoryThread2Test.class);
+		testSuite.addTestSuite(PostNewMBCategoryThread3Test.class);
+		testSuite.addTestSuite(ReplyMBCategoryThread1Reply1Test.class);
+		testSuite.addTestSuite(ReplyMBCategoryThread1Reply2Test.class);
+		testSuite.addTestSuite(ReplyMBCategoryThread1Reply3Test.class);
+		testSuite.addTestSuite(ViewMBCategoryThreadPostCountTest.class);
 		testSuite.addTestSuite(TearDownMBCategoryTest.class);
 		testSuite.addTestSuite(TearDownPageTest.class);
 
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/viewmbcategorymessagerecentposts/ViewMBCategoryMessageRecentPostsTest.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/viewmbcategorythreadrecentposts/ViewMBCategoryThreadRecentPostsTest.html
similarity index 87%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/viewmbcategorymessagerecentposts/ViewMBCategoryMessageRecentPostsTest.html
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/viewmbcategorythreadrecentposts/ViewMBCategoryThreadRecentPostsTest.html
index 586a10a93baef5..dba95e04ae93b4 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/viewmbcategorymessagerecentposts/ViewMBCategoryMessageRecentPostsTest.html
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/viewmbcategorythreadrecentposts/ViewMBCategoryThreadRecentPostsTest.html
@@ -1,12 +1,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>ViewMBCategoryMessageRecentPostsTest</title>
+<title>ViewMBCategoryThreadRecentPostsTest</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3">ViewMBCategoryMessageRecentPostsTest</td></tr>
+<tr><td rowspan="1" colspan="3">ViewMBCategoryThreadRecentPostsTest</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/viewmbcategorymessagerecentposts/ViewMBCategoryMessageRecentPostsTest.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/viewmbcategorythreadrecentposts/ViewMBCategoryThreadRecentPostsTest.java
similarity index 88%
rename from portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/viewmbcategorymessagerecentposts/ViewMBCategoryMessageRecentPostsTest.java
rename to portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/viewmbcategorythreadrecentposts/ViewMBCategoryThreadRecentPostsTest.java
index 028de761b7fa4b..bf7916c05b6425 100644
--- a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbmessage/viewmbcategorymessagerecentposts/ViewMBCategoryMessageRecentPostsTest.java
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/viewmbcategorythreadrecentposts/ViewMBCategoryThreadRecentPostsTest.java
@@ -12,7 +12,7 @@
  * details.
  */
 
-package com.liferay.portalweb.portlet.messageboards.mbmessage.viewmbcategorymessagerecentposts;
+package com.liferay.portalweb.portlet.messageboards.mbthread.viewmbcategorythreadrecentposts;
 
 import com.liferay.portalweb.portal.BaseTestCase;
 import com.liferay.portalweb.portal.util.RuntimeVariables;
@@ -20,9 +20,8 @@
 /**
  * @author Brian Wing Shun Chan
  */
-public class ViewMBCategoryMessageRecentPostsTest extends BaseTestCase {
-	public void testViewMBCategoryMessageRecentPosts()
-		throws Exception {
+public class ViewMBCategoryThreadRecentPostsTest extends BaseTestCase {
+	public void testViewMBCategoryThreadRecentPosts() throws Exception {
 		selenium.open("/web/guest/home/");
 		loadRequiredJavaScriptModules();
 
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/viewmbcategorythreadrecentposts/ViewMBCategoryThreadRecentPostsTests.html b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/viewmbcategorythreadrecentposts/ViewMBCategoryThreadRecentPostsTests.html
new file mode 100644
index 00000000000000..c6ebee75a88559
--- /dev/null
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/viewmbcategorythreadrecentposts/ViewMBCategoryThreadRecentPostsTests.html
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+  <meta content="text/html; charset=UTF-8" http-equiv="content-type" />
+  <title>ViewMBCategoryThreadRecentPostsTests</title>
+</head>
+<body>
+<table id="suiteTable" cellpadding="1" cellspacing="1" border="1" class="selenium"><tbody>
+<tr><td><b>ViewMBCategoryThreadRecentPostsTests</b></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPageMBTest.html">AddPageMBTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPortletMBTest.html">AddPortletMBTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/AddMBCategoryTest.html">AddMBCategoryTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/postnewmbcategorythread/PostNewMBCategoryThreadTest.html">PostNewMBCategoryThreadTest</a></td></tr>
+<tr><td><a href="ViewMBCategoryThreadRecentPostsTest.html">ViewMBCategoryThreadRecentPostsTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbcategory/addmbcategory/TearDownMBCategoryTest.html">TearDownMBCategoryTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portal/util/TearDownPageTest.html">TearDownPageTest</a></td></tr>
+</tbody></table>
+</body>
+</html>
diff --git a/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/viewmbcategorythreadrecentposts/ViewMBCategoryThreadRecentPostsTests.java b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/viewmbcategorythreadrecentposts/ViewMBCategoryThreadRecentPostsTests.java
new file mode 100644
index 00000000000000..9a84d77c9f93d1
--- /dev/null
+++ b/portal-web/test/com/liferay/portalweb/portlet/messageboards/mbthread/viewmbcategorythreadrecentposts/ViewMBCategoryThreadRecentPostsTests.java
@@ -0,0 +1,44 @@
+/**
+ * Copyright (c) 2000-2012 Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package com.liferay.portalweb.portlet.messageboards.mbthread.viewmbcategorythreadrecentposts;
+
+import com.liferay.portalweb.portal.BaseTestSuite;
+import com.liferay.portalweb.portal.util.TearDownPageTest;
+import com.liferay.portalweb.portlet.messageboards.mbcategory.addmbcategory.AddMBCategoryTest;
+import com.liferay.portalweb.portlet.messageboards.mbcategory.addmbcategory.TearDownMBCategoryTest;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbcategorythread.PostNewMBCategoryThreadTest;
+import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPageMBTest;
+import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPortletMBTest;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+/**
+ * @author Brian Wing Shun Chan
+ */
+public class ViewMBCategoryThreadRecentPostsTests extends BaseTestSuite {
+	public static Test suite() {
+		TestSuite testSuite = new TestSuite();
+		testSuite.addTestSuite(AddPageMBTest.class);
+		testSuite.addTestSuite(AddPortletMBTest.class);
+		testSuite.addTestSuite(AddMBCategoryTest.class);
+		testSuite.addTestSuite(PostNewMBCategoryThreadTest.class);
+		testSuite.addTestSuite(ViewMBCategoryThreadRecentPostsTest.class);
+		testSuite.addTestSuite(TearDownMBCategoryTest.class);
+		testSuite.addTestSuite(TearDownPageTest.class);
+
+		return testSuite;
+	}
+}
\ No newline at end of file
diff --git a/portal-web/test/com/liferay/portalweb/properties/messageboards/threadpreviousnext/viewthreadpreviousnextno/ViewMBThreadPreviousNextNoTests.html b/portal-web/test/com/liferay/portalweb/properties/messageboards/threadpreviousnext/viewthreadpreviousnextno/ViewMBThreadPreviousNextNoTests.html
index 44165bef0315cb..b5a9738c3584ad 100644
--- a/portal-web/test/com/liferay/portalweb/properties/messageboards/threadpreviousnext/viewthreadpreviousnextno/ViewMBThreadPreviousNextNoTests.html
+++ b/portal-web/test/com/liferay/portalweb/properties/messageboards/threadpreviousnext/viewthreadpreviousnextno/ViewMBThreadPreviousNextNoTests.html
@@ -10,10 +10,10 @@
 <tr><td><b>Test Suite</b></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPageMBTest.html">AddPageMBTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portlet/messageboards/portlet/addportletmb/AddPortletMBTest.html">AddPortletMBTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/postnewmbthreadmessage/PostNewMBThread1MessageTest.html">PostNewMBThread1MessageTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/postnewmbthreadmessage/PostNewMBThread2MessageTest.html">PostNewMBThread2MessageTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/postnewmbthread/PostNewMBThread1Test.html">PostNewMBThread1Test</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/postnewmbthread/PostNewMBThread2Test.html">PostNewMBThread2Test</a></td></tr>
 <tr><td><a href="ViewMBThreadPreviousNextNoTest.html">ViewMBThreadPreviousNextNoTest</a></td></tr>
-<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbmessage/postnewmbthreadmessage/TearDownMBThreadTest.html">TearDownMBThreadTest</a></td></tr>
+<tr><td><a href="../../../../../portalweb/portlet/messageboards/mbthread/postnewmbthread/TearDownMBThreadTest.html">TearDownMBThreadTest</a></td></tr>
 <tr><td><a href="../../../../../portalweb/portal/util/TearDownPageTest.html">TearDownPageTest</a></td></tr>
 </tbody></table>
 </body>
diff --git a/portal-web/test/com/liferay/portalweb/properties/messageboards/threadpreviousnext/viewthreadpreviousnextno/ViewMBThreadPreviousNextNoTests.java b/portal-web/test/com/liferay/portalweb/properties/messageboards/threadpreviousnext/viewthreadpreviousnextno/ViewMBThreadPreviousNextNoTests.java
index ddf28dc1a6cc67..75fc28af5c0b9c 100644
--- a/portal-web/test/com/liferay/portalweb/properties/messageboards/threadpreviousnext/viewthreadpreviousnextno/ViewMBThreadPreviousNextNoTests.java
+++ b/portal-web/test/com/liferay/portalweb/properties/messageboards/threadpreviousnext/viewthreadpreviousnextno/ViewMBThreadPreviousNextNoTests.java
@@ -16,9 +16,9 @@
 
 import com.liferay.portalweb.portal.BaseTestSuite;
 import com.liferay.portalweb.portal.util.TearDownPageTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbthreadmessage.PostNewMBThread1MessageTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbthreadmessage.PostNewMBThread2MessageTest;
-import com.liferay.portalweb.portlet.messageboards.mbmessage.postnewmbthreadmessage.TearDownMBThreadTest;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbthread.PostNewMBThread1Test;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbthread.PostNewMBThread2Test;
+import com.liferay.portalweb.portlet.messageboards.mbthread.postnewmbthread.TearDownMBThreadTest;
 import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPageMBTest;
 import com.liferay.portalweb.portlet.messageboards.portlet.addportletmb.AddPortletMBTest;
 
@@ -33,8 +33,8 @@ public static Test suite() {
 		TestSuite testSuite = new TestSuite();
 		testSuite.addTestSuite(AddPageMBTest.class);
 		testSuite.addTestSuite(AddPortletMBTest.class);
-		testSuite.addTestSuite(PostNewMBThread1MessageTest.class);
-		testSuite.addTestSuite(PostNewMBThread2MessageTest.class);
+		testSuite.addTestSuite(PostNewMBThread1Test.class);
+		testSuite.addTestSuite(PostNewMBThread2Test.class);
 		testSuite.addTestSuite(ViewMBThreadPreviousNextNoTest.class);
 		testSuite.addTestSuite(TearDownMBThreadTest.class);
 		testSuite.addTestSuite(TearDownPageTest.class);