Clean up protocol tests and add benchmarks