final test shiftings around
post refactor pep8 cleanups
fix the benchmark
fix the other benchmark