[#746] - fix tests fixed by this and other commits
Authored by: Rick Copeland 2010-08-16
Parent(s): [fa850d]
Child(ren): [fc5a54]