Cleaning up JUnit infrastructure.
23 files changed