Add support and tests for heap integration.

Ah, this is true - as the sessionId won't yet exist in our db.  Will update PR.