Adding benchmarks to tests
Readded normal tests along side benchmarks