improved tool + added first test driver for jena