Added a benchmarking test for gene expression diversity, and other optimizations