Just updated the benchmark to use the latest snapshots and cleaned up the tests a bit.