WIP: get essential test working and add should_handoff