FIX: patching things to work with overly stupid nosetests