Added comparision benchmarks, restructured tests