converted test to junit4 and did some cleanup
Authored by: grether 2010-09-28
Parent: [r12806]
Child: [r12808]