fixing failing unit tests due to heartbeat changes
Merge branch 'next' into sam_177