Some fixes for test ordering dependencies
Authored by: Rick Copeland 2010-05-12
Parent(s): [461e73]
Child(ren): [a210f5]