#93 cleaning of post JUnit3 warnings