Fix: Problems from alias failing tests

[marksweb]

This fixes parts of the setup that were causing test failures.

Test failures still exist.

Checks on ModerationRequest and related things that try to count the moderation queue are still broken.