fix classpath issues

fixed classpath issues for cloud deployment and for junit tests to pass.