Revert "Settings Form Avatars Test"

This reverts commit f75b83a27173969302fb3894f887e683da658d94.
Revert "Revert "Settings Form Avatars Test""

This reverts commit 71cba1c9b18113b66201178de24aecf61f554e6c.