[#6007] fix more test failures
Authored by: Dave Brondsema 2013-05-03
Committed by: Cory Johns 2013-06-04
Parent(s): [2927da]
Child(ren): [3fe4b3]