Expanded the system test for both bug #12670 and bug #12679.
Authored by: bugman 2008-12-04
Parent: [r8130]
Child: [r8132]
