little improvements for benchmark test