todo tasks updated
Clean up some tests.
Merge branch 'uploads' into upload_cat