Module rearrangement in the unit tests.
Authored by: bugman 2013-03-23
Parent: [r19039]
Child: [r19041]