Also murder some /me tests

MERGE AGAIN WTF