integration-tests-classpath fixes
integration-tests-classpath fixes