major improvements and benches in test