Add embargos and leases
Switch stub to new expect syntax