Fix mysterious merge regressions in test_skll. Have no idea why they happened.