WIP on fixing nosetests