Make skip-ing work again, so that tests passes again