Update tests_skll.py to include fixes from featureset branch.