clean up more weird ways of making tenant aliases in tests