more code cleanup and trying to get test to work
Authored by: mrieser 2012-04-10
Parent: [r19084]
Child: [r19086]