reorg of tests and log4j for tests
reorg of tests and log4j for tests2