Refactor test bucket creation/deletion.