Tests moved and changed for nosetests