QueryTestcase and StressTestcase finished (not tested yet), Benchmark adjusted, small changes