More JUnit Test updates.