Significant updates, nosetests failing
All nosetests and live tests working