log4j.properties moved to test/resources and other minor changes