More JUnit 4 tests. Some upgrades.