Updated with simple manual test used for heartbeating