Switch all specs to expect syntax