fix tests and benches