A few fixes, and expanding of the benchmark test