classpath changes, more tests