ADD log4j and REFACTOR test location