Updated tests. Runs with JUnit putting under test methods from benchmarks.