Change project classpath to refer to project JAR
Fix tests according to latest changes