Fixes for heartbeat test