Added a few more aliases
Merging in from B_TestBranching