Fix storage container test setup and cleanup