Testing

Corrections and Enhancements to benchmark code.