Fixes for the test_calc() consistency testing system test for the new design.
Authored by: bugman 2011-03-03
Parent: [r12760]
Child: [r12762]