adding code and tests
removing unrelated benchmarks from tests