Making progress preparing to convert the benchmarks
Converted all the tests.  Probably some mistakes somewhere I'm sure.