fixing failing unit tests due to heartbeat changes