refactoring, removed JUnit 4.11 @Eclipse Kepler warnings