Use new expect syntax instead of old should syntax