improved test cases a little bit
allowed modular benchmarking