heartbeat test fixes