Nosetests test fixes