upgrade testing complete
fixed classpath conflict