log4j added; data providers; refactoring