Fixng classpath, logs and most tests
20 files changed