Fixes for the system tests - the data is now in dictionaries.
Authored by: bugman 2010-12-17
Parent: [r11846]
Child: [r11848]
