Clean up some storage tests