Quick edits to make benchmarks build and run.
Unit tests building and passing.

Syntax changes needed.