simplified package, updated testing and added benchmarks