Fixes for the unit tests for the recent rearrangements.
Authored by: bugman 2013-03-23
Parent: [r19046]
Child: [r19048]