Benchmark validity fixes

This PR addresses some issues in the benchmark suite (mainly related to wrong benchmark code and useless checks).

Comments about relevant changes inline