update nosetests
Merge branch 'develop'