Update tests for heartbeat storage rewrite
More work on heartbeat storage rewrite