Added heartbeat test
Fixed heartbeat test
Fixed heartbeat test