some tests and benches fixes