Adding more bulk-erase tests
Smallish updates