improve coverage
fix skip_rest