Fixes test regressions with classpath.