commenting heartbeat for now
fixing unit tests