Fix concurrent modifications
Remove redundant JUnit test messages