Made the benchmarks work with non-zero data
Updated the imports