Added internal and external tests/benchmarks