added and modified several benchmarks and tests.