migrated so tests to use setUp/tearDown - refs #397