Updated benchmarks.

*) Moved initialization code to a public void setUp method.
*) Updated tests.