Bug 490273 - Move tests to JUnit 4

Revert back to junit 4 style.  Accidental usage of JUnit4TestAdapter came back.
1 file changed