Move around some branchTestFoo functions to fit the schema.