moved log4j conf to test package and code formatting