Fixed errors from the nosetests, they run OK.