Working on heartbeat tests