Minor clean up things for test_skll.py