Update Benchmark & move to Tests