Use the correct python version in tests.
Revert to the old way of making scratch buffers. Less flaky.