Remove JUnit 3.8 based test class hierarchy

This commit picks up where 74021b9 left off.