Fix tests for new uploader forms
Fixes to pass tests
Update theme to use avatars