chore(MSC3911): Various clean ups for msc3911 related unit tests#190

jason-famedly merged 1 commit intomsc3911famedly/synapse:msc3911from

jason/cleanup-testsfamedly/synapse:jason/cleanup-testsCopy head branch name to clipboard