Improved junits added plus classpath fixes