fix up tests when using heap1 storage