Expanded out tests and added better benchmarks