Fix core spec failures related to taking out on_hand