Fix JTREG related imports - now make test starts passing