Fixed classpath errors in test