Nosetests, general cleanup