[#6480] Fix tests to match refactors
Signed-off-by: Tim Van Steenburgh tvansteenburgh@gmail.com
Authored by: Tim Van Steenburgh 2013-08-06
Committed by: Dave Brondsema 2013-08-07
Parent(s): [f398a0]
Child(ren): [8a365f]