Moved all actions to pending_orphan_list and fixed specs