Adjustments to get nosetests working again