TESTING: fix testing classpath following refactor